From 122d5c526a43122b1f9ac9bce79e3938c8354e43 Mon Sep 17 00:00:00 2001
From: Alex Converse <alex.converse@gmail.com>
Date: Tue, 7 Aug 2012 12:19:58 -0700
Subject: [PATCH] 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.
---
 libavcodec/aacdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;