From 32c7589bb7ce6b8be733aa88e4786955c7c3a638 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Wed, 19 Sep 2012 19:39:52 +0200 Subject: [PATCH] mpegvideo: release frame buffers before freeing them Fixes triggering an assert in avcodec_default_release_buffer() introduced in 1b3439b30. --- libavcodec/mpegvideo.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index e2e5276..4682ab1 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1104,14 +1104,15 @@ void ff_MPV_common_end(MpegEncContext *s) av_freep(&s->reordered_input_picture); av_freep(&s->dct_offset); - free_context_frame(s); - if (s->picture && !s->avctx->internal->is_copy) { for (i = 0; i < s->picture_count; i++) { free_picture(s, &s->picture[i]); } } av_freep(&s->picture); + + free_context_frame(s); + s->context_initialized = 0; s->last_picture_ptr = s->next_picture_ptr = -- 2.7.4