h264: initialize H264Context.avctx in init_thread_copy
authorAnton Khirnov <anton@khirnov.net>
Thu, 12 Feb 2015 12:06:49 +0000 (13:06 +0100)
committerAnton Khirnov <anton@khirnov.net>
Sat, 21 Feb 2015 08:29:48 +0000 (09:29 +0100)
This prevents using a wrong (first thread's) AVCodecContext if decoding
a frame in the first pass over all threads fails.

libavcodec/h264.c

index c70b259..de19250 100644 (file)
@@ -685,6 +685,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;