Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Do not print 'faac:' when using libfaad.

Browse Source 
Originally committed as revision 20794 to svn://svn.ffmpeg.org/ffmpeg/trunk
release/0.6
Carl Eugen Hoyos 15 years ago
parent a1a63143f1
commit 254dd3f10d
1 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      libavcodec/libfaad.c

4
libavcodec/libfaad.c
Unescape View File

@ -183,7 +183,7 @@ static int faac_decode_frame(AVCodecContext *avctx,
unsigned char channels; unsigned char channels;
int r = s->faacDecInit(s->faac_handle, buf, buf_size, &srate, &channels); int r = s->faacDecInit(s->faac_handle, buf, buf_size, &srate, &channels);
if(r < 0){ if(r < 0){
av_log(avctx, AV_LOG_ERROR, "faac: codec init failed.\n"); av_log(avctx, AV_LOG_ERROR, "libfaad: codec init failed.\n");
return -1; return -1;
} }
avctx->sample_rate = srate; avctx->sample_rate = srate;
@ -195,7 +195,7 @@ static int faac_decode_frame(AVCodecContext *avctx,
out = s->faacDecDecode(s->faac_handle, &frame_info, (unsigned char*)buf, (unsigned long)buf_size); out = s->faacDecDecode(s->faac_handle, &frame_info, (unsigned char*)buf, (unsigned long)buf_size);
if (frame_info.error > 0) { if (frame_info.error > 0) {
av_log(avctx, AV_LOG_ERROR, "faac: frame decoding failed: %s\n", av_log(avctx, AV_LOG_ERROR, "libfaad: frame decoding failed: %s\n",
s->faacDecGetErrorMessage(frame_info.error)); s->faacDecGetErrorMessage(frame_info.error));
return -1; return -1;
} }

Write Preview
Loading…
Cancel
Save