Commit 4b55a7e1 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'a06b0b12'

* commit 'a06b0b12':
  h264: initialize H264Context.avctx in init_thread_copy
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 6458e475 a06b0b12
...@@ -722,6 +722,7 @@ static int decode_init_thread_copy(AVCodecContext *avctx) ...@@ -722,6 +722,7 @@ static int decode_init_thread_copy(AVCodecContext *avctx)
memset(h->sps_buffers, 0, sizeof(h->sps_buffers)); memset(h->sps_buffers, 0, sizeof(h->sps_buffers));
memset(h->pps_buffers, 0, sizeof(h->pps_buffers)); memset(h->pps_buffers, 0, sizeof(h->pps_buffers));
h->avctx = avctx;
h->rbsp_buffer[0] = NULL; h->rbsp_buffer[0] = NULL;
h->rbsp_buffer[1] = NULL; h->rbsp_buffer[1] = NULL;
h->rbsp_buffer_size[0] = 0; h->rbsp_buffer_size[0] = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment