[FFmpeg-cvslog] pthread: make sure AVFrame.extended_data is set properly.

Anton Khirnov git at videolan.org
Tue Sep 25 16:15:41 CEST 2012


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Tue Sep 25 08:08:28 2012 +0200| [7a1a9dd56cb4cafad054bf6d65b21bb24d31c544] | committer: Luca Barbato

pthread: make sure AVFrame.extended_data is set properly.

Signed-off-by: Luca Barbato <lu_zero at gentoo.org>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7a1a9dd56cb4cafad054bf6d65b21bb24d31c544
---

 libavcodec/pthread.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
index e0489ac..0496257 100644
--- 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;



More information about the ffmpeg-cvslog mailing list