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:15 +0100 |
| commit | 582683b6ac798ed2a004a4e2121b7bd47892bbfd (patch) | |
| tree | b2c477720584657ff3a336bc52a80c39c2722b24 /libavcodec/h264_picture.c | |
| parent | 5bc69f38c1af71fbcbfb4b5efa77d0aeb5424c04 (diff) | |
| download | ffmpeg-582683b6ac798ed2a004a4e2121b7bd47892bbfd.tar.gz | |
h264: move remaining ER stuff into the per-slice context
Diffstat (limited to 'libavcodec/h264_picture.c')
| -rw-r--r-- | libavcodec/h264_picture.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/h264_picture.c b/libavcodec/h264_picture.c index 89e83c9ac2..7217f7f953 100644 --- a/libavcodec/h264_picture.c +++ b/libavcodec/h264_picture.c @@ -185,12 +185,12 @@ int ff_h264_field_end(H264Context *h, H264SliceContext *sl, int in_setup) * causes problems for the first MB line, too. */ if (!FIELD_PICTURE(h)) { - h264_set_erpic(&h->er.cur_pic, h->cur_pic_ptr); - h264_set_erpic(&h->er.last_pic, + h264_set_erpic(&sl->er.cur_pic, h->cur_pic_ptr); + h264_set_erpic(&sl->er.last_pic, sl->ref_count[0] ? &sl->ref_list[0][0] : NULL); - h264_set_erpic(&h->er.next_pic, + h264_set_erpic(&sl->er.next_pic, sl->ref_count[1] ? &sl->ref_list[1][0] : NULL); - ff_er_frame_end(&h->er); + ff_er_frame_end(&sl->er); } #endif /* CONFIG_ERROR_RESILIENCE */ |