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:35:17 +0100 |
| commit | 2686dab45eec54f99866413153aa0b36381e48be (patch) | |
| tree | eca9437e3120b924e119e3b9c69d13bb5d7e2bd1 /libavcodec | |
| parent | 06d433366c02ab81a1aaad33d32934b4180d354b (diff) | |
| download | ffmpeg-2686dab45eec54f99866413153aa0b36381e48be.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.
(cherry picked from commit a06b0b1295c51d100101e0ca0434e199ad6de6b5)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavcodec')
| -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 6dca22b94e..e9236e9184 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -686,6 +686,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; |