diff options
| author | Kostya Shishkov <kostya.shishkov@gmail.com> | 2010-02-24 13:11:38 +0000 |
|---|---|---|
| committer | Kostya Shishkov <kostya.shishkov@gmail.com> | 2010-02-24 13:11:38 +0000 |
| commit | d2df291f73377f87cc92fe9b3b516aa55e1ed3cd (patch) | |
| tree | 7ba5eb78fd22e216050f7ef27c2602cb228f75ce | |
| parent | 601e74d3660f0bda7d5d6e5da52bfcdf731952eb (diff) | |
| download | ffmpeg-d2df291f73377f87cc92fe9b3b516aa55e1ed3cd.tar.gz | |
ff_msmpeg4_decode_init() calls ff_h263_decode_init() which calls
MPV_common_init(), so calling both is redundant and leads to memory
leaks in WMV3/VC-1 decoder. Thus use only the first function in
WMV3/VC-1 decoder initialization.
Originally committed as revision 22024 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/vc1dec.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 611b845390..ebd14cb1cb 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -2994,11 +2994,9 @@ static av_cold int vc1_decode_init(AVCodecContext *avctx) avctx->idct_algo=FF_IDCT_WMV2; } - if(ff_h263_decode_init(avctx) < 0) + if(ff_msmpeg4_decode_init(avctx) < 0) return -1; if (vc1_init_common(v) < 0) return -1; - // only for ff_msmp4_mb_i_table - if (ff_msmpeg4_decode_init(avctx) < 0) return -1; avctx->coded_width = avctx->width; avctx->coded_height = avctx->height; |