1 files changed, 4 insertions, 6 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index 909ecb173f..df2a494fba 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -369,12 +369,10 @@ 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[0].status == OC_LOCKED) {
-            ac->oc[1] = ac->oc[0];
-            ac->avctx->channels = ac->oc[1].channels;
-            ac->avctx->channel_layout = ac->oc[1].channel_layout;
-        }
+    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;
     }
 }