[FFmpeg-cvslog] aacdec: Fix Sound fragments after seeking

[kaptnole]

ffmpeg | branch: master | kaptnole <kaptnole at freenet.de> | Sat Nov 26 14:37:39 2011 +0100| [cb8db6423ae9b454944b150b564d079f46276f01] | committer: Michael Niedermayer

aacdec: Fix Sound fragments after seeking
Fixes Ticket420

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

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

 libavcodec/aacdec.c |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index b7f21e0..5a2b230 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -262,6 +262,23 @@ static av_cold int output_configure(AACContext *ac,
     return 0;
 }
 
+static void flush(AVCodecContext *avctx)
+{
+    AACContext *ac= avctx->priv_data;
+    int type, i, j;
+
+    for (type = 3; type >= 0; type--) {
+        for (i = 0; i < MAX_ELEM_ID; i++) {
+            ChannelElement *che = ac->che[type][i];
+            if (che) {
+                for (j = 0; j <= 1; j++) {
+                    memset(che->ch[j].saved, 0, sizeof(che->ch[j].saved));
+                }
+            }
+        }
+    }
+}
+
 /**
  * Decode an array of 4 bit element IDs, optionally interleaved with a stereo/mono switching bit.
  *
@@ -2589,4 +2606,5 @@ AVCodec ff_aac_latm_decoder = {
     },
     .capabilities = CODEC_CAP_CHANNEL_CONF,
     .channel_layouts = aac_channel_layout,
+    .flush = flush,
 };