mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02:00
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
This commit is contained in:
parent
601e74d366
commit
d2df291f73
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user