aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2009-09-04 00:57:20 +0000
committerJustin Ruggles <justin.ruggles@gmail.com>2009-09-04 00:57:20 +0000
commitd6ee035d7a448ad3bd4857e128b3370634c199c8 (patch)
treefc224c85bfab6de0666d407bfe17a41b929c2b35
parente69bb386a29d8f3d351e8c06eb36f0e9173a827a (diff)
downloadffmpeg-d6ee035d7a448ad3bd4857e128b3370634c199c8.tar.gz
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
-rw-r--r--libavcodec/libspeexdec.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/libspeexdec.c b/libavcodec/libspeexdec.c
index 88bf85f209..153e395eb0 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) {