summaryrefslogtreecommitdiffstats
path: root/libavcodec/aacdec_template.c
diff options
context:
space:
mode:
authorAlex Converse <alex.converse@gmail.com>2016-12-06 16:47:46 -0800
committerAlex Converse <alex.converse@gmail.com>2016-12-08 13:31:50 -0800
commitd3795926876bae7c0421585708f9ade573a1f54a (patch)
tree09c0ac491083dc9771a2996ac1814c9aa3884d8a /libavcodec/aacdec_template.c
parentee795d9d26744ce61f44bb9afe2e38471d9b1724 (diff)
downloadffmpeg-streaming-d3795926876bae7c0421585708f9ade573a1f54a.zip
ffmpeg-streaming-d3795926876bae7c0421585708f9ade573a1f54a.tar.gz
aacdec: Allow SBR after DRC.
Fixes https://www2.iis.fraunhofer.de/AAC/7.1auditionOutLeader_v2_rtb.mp4 Reported-by: rcombs on IRC
Diffstat (limited to 'libavcodec/aacdec_template.c')
-rw-r--r--libavcodec/aacdec_template.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c
index 8cfa34b..64d46e3 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;
OpenPOWER on IntegriCloud