diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-21 11:52:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-21 11:53:00 +0100 |
| commit | 4b55a7e1ce686c786825b2b3e3b5115b5bf55ffa (patch) | |
| tree | 211ed72550a974b7c0bbd9d5367642711182c0a9 | |
| parent | 6458e4750f4dc93b7bbbdf08d4de7c9e6ef8ac61 (diff) | |
| parent | a06b0b1295c51d100101e0ca0434e199ad6de6b5 (diff) | |
| download | ffmpeg-4b55a7e1ce686c786825b2b3e3b5115b5bf55ffa.tar.gz | |
Merge commit 'a06b0b1295c51d100101e0ca0434e199ad6de6b5'
* commit 'a06b0b1295c51d100101e0ca0434e199ad6de6b5':
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 f8f99e2422..c10bd8149f 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -722,6 +722,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; |