From e6b1c3bbe7082c71ea8ee8ac83698c156c9e4838 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Fri, 28 Dec 2012 09:54:29 +0100 Subject: pthread: make ff_thread_release_buffer idempotent. I.e. don't do anything on already released frames. --- libavcodec/pthread.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'libavcodec/pthread.c') diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c index 73d9da3f1c..cd44b8c73b 100644 --- a/libavcodec/pthread.c +++ b/libavcodec/pthread.c @@ -975,6 +975,9 @@ void ff_thread_release_buffer(AVCodecContext *avctx, AVFrame *f) PerThreadContext *p = avctx->thread_opaque; FrameThreadContext *fctx; + if (!f->data[0]) + return; + if (!(avctx->active_thread_type&FF_THREAD_FRAME)) { avctx->release_buffer(avctx, f); return; -- cgit v1.2.3