diff options
| author | Anton Khirnov <anton@khirnov.net> | 2015-01-17 22:28:46 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2015-03-21 11:27:13 +0100 |
| commit | 95eb35f30513e335990ad0d5dca6ddc318477291 (patch) | |
| tree | 468c7a537fd11445da96dcaddac3736ab5ef28c9 /libavcodec/h264_picture.c | |
| parent | 7747726667c86877feed30c9e18460cb8e63f551 (diff) | |
| download | ffmpeg-95eb35f30513e335990ad0d5dca6ddc318477291.tar.gz | |
h264: move the ref lists variables into the per-slice context
Diffstat (limited to 'libavcodec/h264_picture.c')
| -rw-r--r-- | libavcodec/h264_picture.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/h264_picture.c b/libavcodec/h264_picture.c index 1d7461b799..89e83c9ac2 100644 --- a/libavcodec/h264_picture.c +++ b/libavcodec/h264_picture.c @@ -144,7 +144,7 @@ static void h264_set_erpic(ERPicture *dst, H264Picture *src) } #endif /* CONFIG_ERROR_RESILIENCE */ -int ff_h264_field_end(H264Context *h, int in_setup) +int ff_h264_field_end(H264Context *h, H264SliceContext *sl, int in_setup) { AVCodecContext *const avctx = h->avctx; int err = 0; @@ -187,9 +187,9 @@ int ff_h264_field_end(H264Context *h, int in_setup) if (!FIELD_PICTURE(h)) { h264_set_erpic(&h->er.cur_pic, h->cur_pic_ptr); h264_set_erpic(&h->er.last_pic, - h->ref_count[0] ? &h->ref_list[0][0] : NULL); + sl->ref_count[0] ? &sl->ref_list[0][0] : NULL); h264_set_erpic(&h->er.next_pic, - h->ref_count[1] ? &h->ref_list[1][0] : NULL); + sl->ref_count[1] ? &sl->ref_list[1][0] : NULL); ff_er_frame_end(&h->er); } #endif /* CONFIG_ERROR_RESILIENCE */ |