[FFmpeg-cvslog] h264: initialize H264Context.avctx in init_thread_copy

Anton Khirnov git at videolan.org
Mon Mar 9 12:35:43 CET 2015


ffmpeg | branch: release/2.2 | Anton Khirnov <anton at khirnov.net> | Thu Feb 12 13:06:49 2015 +0100| [3670942fae7beb2bfde52557ee95eab5f536e624] | committer: Anton Khirnov

h264: initialize H264Context.avctx in init_thread_copy

This prevents using a wrong (first thread's) AVCodecContext if decoding
a frame in the first pass over all threads fails.

(cherry picked from commit a06b0b1295c51d100101e0ca0434e199ad6de6b5)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
(cherry picked from commit 2686dab45eec54f99866413153aa0b36381e48be)
Signed-off-by: Anton Khirnov <anton at khirnov.net>

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

 libavcodec/h264.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index b2785de..857a949 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1642,6 +1642,7 @@ static int decode_init_thread_copy(AVCodecContext *avctx)
     memset(h->sps_buffers, 0, sizeof(h->sps_buffers));
     memset(h->pps_buffers, 0, sizeof(h->pps_buffers));
 
+    h->avctx               = avctx;
     h->rbsp_buffer[0]      = NULL;
     h->rbsp_buffer[1]      = NULL;
     h->rbsp_buffer_size[0] = 0;



More information about the ffmpeg-cvslog mailing list