diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-11 12:30:32 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-11 12:30:32 +0100 |
commit | 8bfc8d88be9be07c53aa290515d022c9a938e18d (patch) | |
tree | 7baa8f8cf672b391fd7f4dd676f10900b6a47e29 /libavcodec/vp3.c | |
parent | 3ac85bebd51c868e675c4c0d4361e400609e6f15 (diff) | |
parent | ec86ba57312745fd7ad9771e3121e79c6aacba30 (diff) | |
download | ffmpeg-streaming-8bfc8d88be9be07c53aa290515d022c9a938e18d.zip ffmpeg-streaming-8bfc8d88be9be07c53aa290515d022c9a938e18d.tar.gz |
Merge commit 'ec86ba57312745fd7ad9771e3121e79c6aacba30'
* commit 'ec86ba57312745fd7ad9771e3121e79c6aacba30':
vp3: Fix double free in vp3_decode_end()
fate: Split fate-siff test into demuxer and VB video decoder test
Conflicts:
tests/fate/demux.mak
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vp3.c')
-rw-r--r-- | libavcodec/vp3.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index d4425bc..dcc2578 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -281,15 +281,15 @@ static av_cold int vp3_decode_end(AVCodecContext *avctx) Vp3DecodeContext *s = avctx->priv_data; int i; - av_free(s->superblock_coding); - av_free(s->all_fragments); - av_free(s->coded_fragment_list[0]); - av_free(s->dct_tokens_base); - av_free(s->superblock_fragments); - av_free(s->macroblock_coding); - av_free(s->motion_val[0]); - av_free(s->motion_val[1]); - av_free(s->edge_emu_buffer); + av_freep(&s->superblock_coding); + av_freep(&s->all_fragments); + av_freep(&s->coded_fragment_list[0]); + av_freep(&s->dct_tokens_base); + av_freep(&s->superblock_fragments); + av_freep(&s->macroblock_coding); + av_freep(&s->motion_val[0]); + av_freep(&s->motion_val[1]); + av_freep(&s->edge_emu_buffer); if (avctx->internal->is_copy) return 0; |