Merge commit 'bd737b5178f361a9b592691848f29a7a79603a7e'

* commit 'bd737b5178f361a9b592691848f29a7a79603a7e':
  h264: reset the private data in init_thread_copy()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-04-05 22:25:22 +02:00
commit 39c6834c12

View File

@ -713,8 +713,8 @@ static int decode_init_thread_copy(AVCodecContext *avctx)
if (!avctx->internal->is_copy) if (!avctx->internal->is_copy)
return 0; return 0;
memset(h->sps_buffers, 0, sizeof(h->sps_buffers));
memset(h->pps_buffers, 0, sizeof(h->pps_buffers)); memset(h, 0, sizeof(*h));
ret = h264_init_context(avctx, h); ret = h264_init_context(avctx, h);
if (ret < 0) if (ret < 0)