projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
729b371
)
pthread: make ff_thread_release_buffer idempotent.
author
Anton Khirnov
<anton@khirnov.net>
Fri, 28 Dec 2012 08:54:29 +0000
(09:54 +0100)
committer
Anton Khirnov
<anton@khirnov.net>
Tue, 29 Jan 2013 06:32:10 +0000
(07:32 +0100)
I.e. don't do anything on already released frames.
libavcodec/pthread.c
patch
|
blob
|
history
diff --git
a/libavcodec/pthread.c
b/libavcodec/pthread.c
index 73d9da3f1c35b609ee84e3babab130b644bb8a60..cd44b8c73b797c512f57653875bc4b7901840a83 100644
(file)
--- 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;