[FFmpeg-cvslog] h264: initialize H264Context.avctx in init_thread_copy
Anton Khirnov
git at videolan.org
Sat Feb 28 19:14:56 CET 2015
ffmpeg | branch: release/2.4 | Anton Khirnov <anton at khirnov.net> | Thu Feb 12 13:06:49 2015 +0100| [2686dab45eec54f99866413153aa0b36381e48be] | 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>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2686dab45eec54f99866413153aa0b36381e48be
---
libavcodec/h264.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 6dca22b..e9236e9 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;
More information about the ffmpeg-cvslog
mailing list