diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 12:48:39 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 12:48:39 +0300 |
| commit | cd63252f1ff61d894a1c3a59fee7d1e49dbfdeb4 (patch) | |
| tree | 55dbcca36fb0ff5debc922d1ac185d4b6f1dcf5b /libavcodec/h264_slice.c | |
| parent | e8a460672f7e9aec129a7cfa01345857b1565a15 (diff) | |
| parent | a6cd154463bea7eb56d28192db4c8c6d83f67fd7 (diff) | |
Merge commit 'a6cd154463bea7eb56d28192db4c8c6d83f67fd7'
* commit 'a6cd154463bea7eb56d28192db4c8c6d83f67fd7':
h264: move the DPB init/uninit to init_context()/free_context()
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_slice.c')
| -rw-r--r-- | libavcodec/h264_slice.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 096bc0d24e..fbb6526ecc 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -488,6 +488,7 @@ int ff_h264_update_thread_context(AVCodecContext *dst, if (!inited) { H264SliceContext *orig_slice_ctx = h->slice_ctx; + H264Picture *orig_DPB = h->DPB; for (i = 0; i < MAX_SPS_COUNT; i++) av_freep(h->sps_buffers + i); @@ -505,6 +506,7 @@ int ff_h264_update_thread_context(AVCodecContext *dst, memset(&h->last_pic_for_ec, 0, sizeof(h->last_pic_for_ec)); h->slice_ctx = orig_slice_ctx; + h->DPB = orig_DPB; memset(&h->slice_ctx[0].er, 0, sizeof(h->slice_ctx[0].er)); memset(&h->slice_ctx[0].mb, 0, sizeof(h->slice_ctx[0].mb)); @@ -512,7 +514,6 @@ int ff_h264_update_thread_context(AVCodecContext *dst, memset(&h->slice_ctx[0].mb_padding, 0, sizeof(h->slice_ctx[0].mb_padding)); h->avctx = dst; - h->DPB = NULL; h->qscale_table_pool = NULL; h->mb_type_pool = NULL; h->ref_index_pool = NULL; |