diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 16:07:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 16:07:53 +0100 |
| commit | da7f4c32ab6bf517d4ef51297da46cf459479b22 (patch) | |
| tree | 63d729fabc2501ad6d9dc2c5bdfc241f274307fe /libavcodec/h264_slice.c | |
| parent | 04d23cf1c5f678f5fe0fe0eb5fd92a59c70e8c42 (diff) | |
| parent | 9951907f6fc37a8d41566dbee09f7c15ff587de6 (diff) | |
| download | ffmpeg-da7f4c32ab6bf517d4ef51297da46cf459479b22.tar.gz | |
Merge commit '9951907f6fc37a8d41566dbee09f7c15ff587de6'
* commit '9951907f6fc37a8d41566dbee09f7c15ff587de6':
h264: move redundant_pic_count into the per-slice 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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 88e702f6ef..9591bea08e 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -656,7 +656,7 @@ int ff_h264_update_thread_context(AVCodecContext *dst, h->dequant_coeff_pps = h1->dequant_coeff_pps; // POC timing - copy_fields(h, h1, poc_lsb, redundant_pic_count); + copy_fields(h, h1, poc_lsb, default_ref_list); // reference lists copy_fields(h, h1, short_ref, thread_context); @@ -1790,7 +1790,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl, H264Contex ff_init_poc(h, h->cur_pic_ptr->field_poc, &h->cur_pic_ptr->poc); if (h->pps.redundant_pic_cnt_present) - h->redundant_pic_count = get_ue_golomb(&h->gb); + sl->redundant_pic_count = get_ue_golomb(&h->gb); ret = ff_set_ref_count(h, sl); if (ret < 0) |