From: Justin Ruggles <justin.ruggles@gmail.com>
Date: Fri, 4 Sep 2009 00:57:20 +0000 (+0000)
Subject: libspeex: Do not set AVCodecContext.frame_size in decoder init if there is no
X-Git-Tag: v0.6~3443
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d6ee035d7a448ad3bd4857e128b3370634c199c8;p=coroid%2Flibav_saccubus.git

libspeex: Do not set AVCodecContext.frame_size in decoder init if there is no
header in extradata since the default value will be incorrect for multiple
frames per packet.

Originally committed as revision 19755 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavcodec/libspeexdec.c b/libavcodec/libspeexdec.c
index 88bf85f20..153e395eb 100644
--- a/libavcodec/libspeexdec.c
+++ b/libavcodec/libspeexdec.c
@@ -78,8 +78,7 @@ static av_cold int libspeex_decode_init(AVCodecContext *avctx)
     }
 
     if (!s->header) {
-        speex_decoder_ctl(s->dec_state, SPEEX_GET_FRAME_SIZE, &avctx->frame_size);
-        s->frame_size = avctx->frame_size;
+        speex_decoder_ctl(s->dec_state, SPEEX_GET_FRAME_SIZE, &s->frame_size);
     }
 
     if (avctx->channels == 2) {