diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 20:58:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 21:05:12 +0200 |
| commit | db8ae37a783aba18d8f869dae1824a3e3f984bf8 (patch) | |
| tree | 280cfe9fdd15922660e34052e0dce0e93ab335c5 /libavcodec/snow.c | |
| parent | 34d278f9838e355b3b2c7a9c0f77d7fcaf37ce49 (diff) | |
| parent | da0c8664b4dc906696803685f7e53ade68594ab8 (diff) | |
| download | ffmpeg-db8ae37a783aba18d8f869dae1824a3e3f984bf8.tar.gz | |
Merge commit 'da0c8664b4dc906696803685f7e53ade68594ab8'
* 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>
Diffstat (limited to 'libavcodec/snow.c')
| -rw-r--r-- | libavcodec/snow.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/snow.c b/libavcodec/snow.c index 5201d57422..fc2e7279f3 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -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); |