From d3795926876bae7c0421585708f9ade573a1f54a Mon Sep 17 00:00:00 2001 From: Alex Converse Date: Tue, 6 Dec 2016 16:47:46 -0800 Subject: [PATCH] aacdec: Allow SBR after DRC. Fixes https://www2.iis.fraunhofer.de/AAC/7.1auditionOutLeader_v2_rtb.mp4 Reported-by: rcombs on IRC --- libavcodec/aacdec_template.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c index 8cfa34b255..64d46e394e 100644 --- a/libavcodec/aacdec_template.c +++ b/libavcodec/aacdec_template.c @@ -3038,8 +3038,10 @@ static int aac_decode_frame_int(AVCodecContext *avctx, void *data, break; } - che_prev = che; - elem_type_prev = elem_type; + if (elem_type < TYPE_DSE) { + che_prev = che; + elem_type_prev = elem_type; + } if (err) goto fail;