Browse code

aacdec: Evaluate further PCE elements.

Fixes Music\ Station\ Super\ Live\ -\ 2011.12.23.mkv

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Michael Niedermayer authored on 2011/12/31 04:36:11
Showing 1 changed files
... ...
@@ -2201,10 +2201,11 @@ static int aac_decode_frame_int(AVCodecContext *avctx, void *data,
2201 2201
             if ((err = decode_pce(avctx, &ac->m4ac, new_che_pos, gb)))
2202 2202
                 break;
2203 2203
             if (ac->output_configured > OC_TRIAL_PCE)
2204
-                av_log(avctx, AV_LOG_ERROR,
2205
-                       "Not evaluating a further program_config_element as this construct is dubious at best.\n");
2206
-            else
2207
-                err = output_configure(ac, ac->che_pos, new_che_pos, 0, OC_TRIAL_PCE);
2204
+                av_log(avctx, AV_LOG_INFO,
2205
+                       "Evaluating a further program_config_element.\n");
2206
+            err = output_configure(ac, ac->che_pos, new_che_pos, 0, OC_TRIAL_PCE);
2207
+            if (!err)
2208
+                ac->m4ac.chan_config = 0;
2208 2209
             break;
2209 2210
         }
2210 2211