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:
c8ba8be
)
pthread: make sure AVFrame.extended_data is set properly.
author
Anton Khirnov
<anton@khirnov.net>
Tue, 25 Sep 2012 06:08:28 +0000
(08:08 +0200)
committer
Luca Barbato
<lu_zero@gentoo.org>
Tue, 25 Sep 2012 10:03:23 +0000
(12:03 +0200)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
libavcodec/pthread.c
patch
|
blob
|
history
diff --git
a/libavcodec/pthread.c
b/libavcodec/pthread.c
index e0489acffb5bd5d33ff18fa6fae2f366dd16dd6a..0496257fdee2a2994f0b09a4ce40f201eb99a9b0 100644
(file)
--- a/
libavcodec/pthread.c
+++ b/
libavcodec/pthread.c
@@
-377,6
+377,10
@@
static attribute_align_arg void *frame_worker_thread(void *arg)
p->got_frame = 0;
p->result = codec->decode(avctx, &p->frame, &p->got_frame, &p->avpkt);
+ /* many decoders assign whole AVFrames, thus overwriting extended_data;
+ * make sure it's set correctly */
+ p->frame.extended_data = p->frame.data;
+
if (p->state == STATE_SETTING_UP) ff_thread_finish_setup(avctx);
p->state = STATE_INPUT_READY;