diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-28 19:05:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-28 19:05:14 +0100 |
| commit | 1172107d570baa6f01d5c11584090a8cbe552e14 (patch) | |
| tree | 541ba712b7623f8a183d6d1c0c1aafe548a66d1b | |
| parent | a22079b8193b3ce3119b4440a4972098cd141e4e (diff) | |
| parent | 2686dab45eec54f99866413153aa0b36381e48be (diff) | |
| download | ffmpeg-1172107d570baa6f01d5c11584090a8cbe552e14.tar.gz | |
Merge commit '2686dab45eec54f99866413153aa0b36381e48be' into release/2.4
* commit '2686dab45eec54f99866413153aa0b36381e48be':
h264: initialize H264Context.avctx in init_thread_copy
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -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 e554e246c5..7b5c5063b8 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; |