diff options
| author | Alex Converse <alex.converse@gmail.com> | 2012-08-07 12:19:58 -0700 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2012-08-08 16:55:41 -0700 |
| commit | 122d5c526a43122b1f9ac9bce79e3938c8354e43 (patch) | |
| tree | 2449eb1bb0e930cddfcdfaa62d6f0bbf11176274 | |
| parent | f89584ca4458c84467e9fb27567e33891d1c7cd5 (diff) | |
| download | ffmpeg-122d5c526a43122b1f9ac9bce79e3938c8354e43.tar.gz | |
aacdec: Don't fall back to the old output configuration when no old configuration is present.
Fixes MP4 files where the first frame is broken.
| -rw-r--r-- | libavcodec/aacdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 958c9d2f97..1c59ec5937 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -365,7 +365,7 @@ static void push_output_configuration(AACContext *ac) { * configuration is unlocked. */ static void pop_output_configuration(AACContext *ac) { - if (ac->oc[1].status != OC_LOCKED) { + if (ac->oc[1].status != OC_LOCKED && ac->oc[0].status != OC_NONE) { ac->oc[1] = ac->oc[0]; ac->avctx->channels = ac->oc[1].channels; ac->avctx->channel_layout = ac->oc[1].channel_layout; |