diff options
Diffstat (limited to 'libavcodec/mpegvideo.c')
-rw-r--r-- | libavcodec/mpegvideo.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 42367e1e48..773c9e258b 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1008,9 +1008,6 @@ static int free_context_frame(MpegEncContext *s) for (i = 0; i < 3; i++) av_freep(&s->visualization_buffer[i]); - if (!(s->avctx->active_thread_type & FF_THREAD_FRAME)) - avcodec_default_free_buffers(s->avctx); - return 0; } @@ -1126,6 +1123,9 @@ void ff_MPV_common_end(MpegEncContext *s) free_context_frame(s); + if (!(s->avctx->active_thread_type & FF_THREAD_FRAME)) + avcodec_default_free_buffers(s->avctx); + s->context_initialized = 0; s->last_picture_ptr = s->next_picture_ptr = @@ -1244,7 +1244,7 @@ static inline int pic_is_unused(MpegEncContext *s, Picture *pic) { if (pic->f.data[0] == NULL) return 1; - if (pic->needs_realloc) + if (pic->needs_realloc && !(pic->f.reference & DELAYED_PIC_REF)) if (!pic->owner2 || pic->owner2 == s) return 1; return 0; |