ffmpeg | branch: master | Rostislav Pehlivanov <[email protected]> | Sat Aug 29 06:28:21 2015 +0100| [949a4892fa1dd6da028229cb1674340542fc9bc4] | committer: Rostislav Pehlivanov
aacenc: change FF_PROFILE_UNKNOWN to AAC-Main if prediction is enabled This was missed when the original commits were done. FF_PROFILE_UNKNOWN is what's in avctx->profile when no audio profile is specified. Signed-off-by: Rostislav Pehlivanov <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=949a4892fa1dd6da028229cb1674340542fc9bc4 --- libavcodec/aacenc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index 71071eb..ece2328 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -786,11 +786,12 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) "Too many bits per frame requested, clamping to max\n"); if (avctx->profile == FF_PROFILE_AAC_MAIN) { s->options.pred = 1; - } else if (avctx->profile == FF_PROFILE_AAC_LOW && s->options.pred) { + } else if ((avctx->profile == FF_PROFILE_AAC_LOW || + avctx->profile == FF_PROFILE_UNKNOWN) && s->options.pred) { s->profile = 0; /* Main */ WARN_IF(1, "Prediction requested, changing profile to AAC-Main\n"); } else if (avctx->profile == FF_PROFILE_AAC_LOW || - avctx->profile == FF_PROFILE_UNKNOWN) { + avctx->profile == FF_PROFILE_UNKNOWN) { s->profile = 1; /* Low */ } else { ERROR_IF(1, "Unsupported profile %d\n", avctx->profile); _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
