Mercurial > libavcodec.hg

comparison libfaad.c @ 10671:3ef57f4fa579 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Do not print 'faac:' when using libfaad.
author cehoyos
date Thu, 10 Dec 2009 22:29:21 +0000
parents 89527d128fc9
children 8a4984c5cacc
comparison
equal deleted inserted replaced
10670:7986ecc952e1 10671:3ef57f4fa579
181 if(!s->init){ 181 if(!s->init){
182 unsigned long srate; 182 unsigned long srate;
183 unsigned char channels; 183 unsigned char channels;
184 int r = s->faacDecInit(s->faac_handle, buf, buf_size, &srate, &channels); 184 int r = s->faacDecInit(s->faac_handle, buf, buf_size, &srate, &channels);
185 if(r < 0){ 185 if(r < 0){
186 av_log(avctx, AV_LOG_ERROR, "faac: codec init failed.\n"); 186 av_log(avctx, AV_LOG_ERROR, "libfaad: codec init failed.\n");
187 return -1; 187 return -1;
188 } 188 }
189 avctx->sample_rate = srate; 189 avctx->sample_rate = srate;
190 avctx->channels = channels; 190 avctx->channels = channels;
191 channel_setup(avctx); 191 channel_setup(avctx);
193 } 193 }
194 194
195 out = s->faacDecDecode(s->faac_handle, &frame_info, (unsigned char*)buf, (unsigned long)buf_size); 195 out = s->faacDecDecode(s->faac_handle, &frame_info, (unsigned char*)buf, (unsigned long)buf_size);
196 196
197 if (frame_info.error > 0) { 197 if (frame_info.error > 0) {
198 av_log(avctx, AV_LOG_ERROR, "faac: frame decoding failed: %s\n", 198 av_log(avctx, AV_LOG_ERROR, "libfaad: frame decoding failed: %s\n",
199 s->faacDecGetErrorMessage(frame_info.error)); 199 s->faacDecGetErrorMessage(frame_info.error));
200 return -1; 200 return -1;
201 } 201 }
202 if (!avctx->frame_size) 202 if (!avctx->frame_size)
203 avctx->frame_size = frame_info.samples/avctx->channels; 203 avctx->frame_size = frame_info.samples/avctx->channels;