highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aacenc: change FF_PROFILE_UNKNOWN to AAC-Main if prediction is enabled

Browse Source 
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 <atomnuker@gmail.com>
This commit is contained in:
Rostislav Pehlivanov
2015-08-29 06:28:21 +01:00
parent 20962b567b
commit 949a4892fa
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/aacenc.c
View File

@@ -786,11 +786,12 @@ static av_cold int aac_encode_init(AVCodecContext *avctx)
"Too many bits per frame requested, clamping to max\n"); "Too many bits per frame requested, clamping to max\n");
if (avctx->profile == FF_PROFILE_AAC_MAIN) { if (avctx->profile == FF_PROFILE_AAC_MAIN) {
s->options.pred = 1; 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 */ s->profile = 0; /* Main */
WARN_IF(1, "Prediction requested, changing profile to AAC-Main\n"); WARN_IF(1, "Prediction requested, changing profile to AAC-Main\n");
} else if (avctx->profile == FF_PROFILE_AAC_LOW || } else if (avctx->profile == FF_PROFILE_AAC_LOW ||
avctx->profile == FF_PROFILE_UNKNOWN) { avctx->profile == FF_PROFILE_UNKNOWN) {
s->profile = 1; /* Low */ s->profile = 1; /* Low */
} else { } else {
ERROR_IF(1, "Unsupported profile %d\n", avctx->profile); ERROR_IF(1, "Unsupported profile %d\n", avctx->profile);