History

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.

Rostislav Pehlivanov committed 11 years ago

Commit 949a4891 parent 20962b51 file · +3 −2Browse files

Unified · Split

libavcodec/aacenc.c+3−2
@@ -786,11 +786,12 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) · 785 unmodified lines
786 "Too many bits per frame requested, clamping to max\n");786 "Too many bits per frame requested, clamping to max\n");
787 if (avctx->profile == FF_PROFILE_AAC_MAIN) {787 if (avctx->profile == FF_PROFILE_AAC_MAIN) {
788 s->options.pred = 1;788 s->options.pred = 1;
789 } else if (avctx->profile == FF_PROFILE_AAC_LOW && s->options.pred) {789 } else if ((avctx->profile == FF_PROFILE_AAC_LOW ||
790 avctx->profile == FF_PROFILE_UNKNOWN) && s->options.pred) {
790 s->profile = 0; /* Main */791 s->profile = 0; /* Main */
791 WARN_IF(1, "Prediction requested, changing profile to AAC-Main\n");792 WARN_IF(1, "Prediction requested, changing profile to AAC-Main\n");
792 } else if (avctx->profile == FF_PROFILE_AAC_LOW ||793 } else if (avctx->profile == FF_PROFILE_AAC_LOW ||
793 avctx->profile == FF_PROFILE_UNKNOWN) {794 avctx->profile == FF_PROFILE_UNKNOWN) {
794 s->profile = 1; /* Low */795 s->profile = 1; /* Low */
795 } else {796 } else {
796 ERROR_IF(1, "Unsupported profile %d\n", avctx->profile);797 ERROR_IF(1, "Unsupported profile %d\n", avctx->profile);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t