avcodec/aacdec: Fix storing state before PCE decode
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Apr 2015 22:04:44 +0000 (00:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Apr 2015 22:42:25 +0000 (00:42 +0200)
Fixes Ticket4460

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/aacdec.c

index daec5bc..5a0c05a 100644 (file)
@@ -424,7 +424,7 @@ static uint64_t sniff_channel_order(uint8_t (*layout_map)[3], int tags)
  * Save current output configuration if and only if it has been locked.
  */
 static void push_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[0] = ac->oc[1];
     }
     ac->oc[1].status = OC_NONE;