generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'da0c8664b4dc906696803685f7e53ade68594ab8'

Browse Source 
* commit 'da0c8664b4dc906696803685f7e53ade68594ab8':
  mpegvideo: Move various temporary buffers to a separate context

Conflicts:
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/mpegvideo_motion.c
	libavcodec/rv34.c
	libavcodec/vc1_mc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-06-08 20:58:13 +02:00
parent 34d278f983 da0c8664b4
commit db8ae37a78
10 changed files with 107 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/snow.c
View File

@@ -704,7 +704,7 @@ av_cold void ff_snow_common_end(SnowContext *s)
av_freep(&s->m.me.scratchpad);
av_freep(&s->m.me.map);
av_freep(&s->m.me.score_map);
av_freep(&s->m.obmc_scratchpad);
av_freep(&s->m.sc.obmc_scratchpad);
av_freep(&s->block);
av_freep(&s->scratchbuf);