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

[Anton Khirnov]

ffmpeg | branch: release/2.5 | Anton Khirnov <anton at khirnov.net> | Thu Feb 12 13:06:49 2015 +0100| [84341627d795a330cd9edf291b6d62e5cea383e0] | committer: Michael Niedermayer

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)

Conflicts:

	libavcodec/h264.c

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

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

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 438c43f..ac8adf3 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -727,6 +727,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;