diff options
| author | Anton Khirnov <anton@khirnov.net> | 2015-02-12 13:06:49 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2015-02-21 09:29:48 +0100 |
| commit | a06b0b1295c51d100101e0ca0434e199ad6de6b5 (patch) | |
| tree | afbef6c33d3abf19b522af8a9d00e9bbc9dc10e2 | |
| parent | 0dea4c77ccf5956561bb8991311b3d834bb5fa40 (diff) | |
| download | ffmpeg-a06b0b1295c51d100101e0ca0434e199ad6de6b5.tar.gz | |
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.
| -rw-r--r-- | libavcodec/h264.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index c70b2595f5..de192501fa 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -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; |