eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-13 10:30:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

ff_msmpeg4_decode_init() calls ff_h263_decode_init() which calls

Browse Source 
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:
Kostya Shishkov
2010-02-24 13:11:38 +00:00
parent 601e74d366
commit d2df291f73
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/vc1dec.c
View File

@@ -2994,11 +2994,9 @@ static av_cold int vc1_decode_init(AVCodecContext *avctx)
avctx->idct_algo=FF_IDCT_WMV2; avctx->idct_algo=FF_IDCT_WMV2;
} }
if(ff_h263_decode_init(avctx) < 0) if(ff_msmpeg4_decode_init(avctx) < 0)
return -1; return -1;
if (vc1_init_common(v) < 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_width = avctx->width;
avctx->coded_height = avctx->height; avctx->coded_height = avctx->height;