[FFmpeg-cvslog] aacdec: Allow SBR after DRC.

Alex Converse git at videolan.org
Fri Dec 9 02:15:58 EET 2016


ffmpeg | branch: master | Alex Converse <alex.converse at gmail.com> | Tue Dec  6 16:47:46 2016 -0800| [d3795926876bae7c0421585708f9ade573a1f54a] | committer: Alex Converse

aacdec: Allow SBR after DRC.

Fixes https://www2.iis.fraunhofer.de/AAC/7.1auditionOutLeader_v2_rtb.mp4

Reported-by: rcombs on IRC

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d3795926876bae7c0421585708f9ade573a1f54a
---

 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 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;



More information about the ffmpeg-cvslog mailing list