[SCM] libav/experimental: Flush the bitreservour. Fixes issue1716

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:59:05 UTC 2013


The following commit has been merged in the experimental branch:
commit f28f146473808fdf97501caab1249381e909cf2c
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sat Jan 30 21:55:18 2010 +0000

    Flush the bitreservour.
    Fixes issue1716
    
    Originally committed as revision 21559 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c
index 958e185..5e04e51 100644
--- a/libavcodec/wmadec.c
+++ b/libavcodec/wmadec.c
@@ -920,6 +920,14 @@ static int wma_decode_superframe(AVCodecContext *avctx,
     return -1;
 }
 
+static av_cold void flush(AVCodecContext *avctx)
+{
+    WMACodecContext *s = avctx->priv_data;
+
+    s->last_bitoffset=
+    s->last_superframe_len= 0;
+}
+
 AVCodec wmav1_decoder =
 {
     "wmav1",
@@ -930,6 +938,7 @@ AVCodec wmav1_decoder =
     NULL,
     ff_wma_end,
     wma_decode_superframe,
+    .flush=flush,
     .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 1"),
 };
 
@@ -943,5 +952,6 @@ AVCodec wmav2_decoder =
     NULL,
     ff_wma_end,
     wma_decode_superframe,
+    .flush=flush,
     .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 2"),
 };

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list