Browse Source

av_log patch by ("Steven M. Schultz" <sms at 2BSD dot COM>)

Originally committed as revision 2809 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Steven M. Schultz Michael Niedermayer 22 years ago
parent
commit
c0a2c42f59
1 changed files with 2 additions and 3 deletions
  1. +2
    -3
      libavcodec/faac.c

+ 2
- 3
libavcodec/faac.c View File

@@ -46,8 +46,7 @@ static int Faac_encode_init(AVCodecContext *avctx)
/* check faac version */ /* check faac version */
faac_cfg = faacEncGetCurrentConfiguration(s->faac_handle); faac_cfg = faacEncGetCurrentConfiguration(s->faac_handle);
if (faac_cfg->version != FAAC_CFG_VERSION) { if (faac_cfg->version != FAAC_CFG_VERSION) {
fprintf(stderr, "wrong libfaac version (compiled for: %d, using %d)\n",
FAAC_CFG_VERSION, faac_cfg->version );
av_log(avctx, AV_LOG_ERROR, "wrong libfaac version (compiled for: %d, using %d)\n", FAAC_CFG_VERSION, faac_cfg->version);
faacEncClose(s->faac_handle); faacEncClose(s->faac_handle);
return -1; return -1;
} }
@@ -62,7 +61,7 @@ static int Faac_encode_init(AVCodecContext *avctx)
faac_cfg->inputFormat = FAAC_INPUT_16BIT; faac_cfg->inputFormat = FAAC_INPUT_16BIT;


if (!faacEncSetConfiguration(s->faac_handle, faac_cfg)) { if (!faacEncSetConfiguration(s->faac_handle, faac_cfg)) {
fprintf(stderr, "libfaac doesn't support this output format!\n");
av_log(avctx, AV_LOG_ERROR, "libfaac doesn't support this output format!\n");
return -1; return -1;
} }




Loading…
Cancel
Save