diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 20:00:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 20:00:34 +0100 |
| commit | 830e548b9ec32ad7ab02be056db15cbcf3c58346 (patch) | |
| tree | 03ce45e4c52217252ae2fb8f960d75cd4f23d51c /libavcodec/h264_picture.c | |
| parent | 44309dd29466bf2d9d9fa26ab6e73e7e64989c75 (diff) | |
| parent | 582683b6ac798ed2a004a4e2121b7bd47892bbfd (diff) | |
| download | ffmpeg-830e548b9ec32ad7ab02be056db15cbcf3c58346.tar.gz | |
Merge commit '582683b6ac798ed2a004a4e2121b7bd47892bbfd'
* commit '582683b6ac798ed2a004a4e2121b7bd47892bbfd':
h264: move remaining ER stuff into the per-slice context
Conflicts:
libavcodec/h264.h
libavcodec/h264_picture.c
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_picture.c')
| -rw-r--r-- | libavcodec/h264_picture.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/h264_picture.c b/libavcodec/h264_picture.c index 65135e4922..d63a12e1f2 100644 --- a/libavcodec/h264_picture.c +++ b/libavcodec/h264_picture.c @@ -199,22 +199,22 @@ int ff_h264_field_end(H264Context *h, H264SliceContext *sl, int in_setup) if (!FIELD_PICTURE(h) && h->current_slice && !h->sps.new) { int use_last_pic = h->last_pic_for_ec.f.buf[0] && !sl->ref_count[0]; - ff_h264_set_erpic(&h->er.cur_pic, h->cur_pic_ptr); + ff_h264_set_erpic(&sl->er.cur_pic, h->cur_pic_ptr); if (use_last_pic) { - ff_h264_set_erpic(&h->er.last_pic, &h->last_pic_for_ec); + ff_h264_set_erpic(&sl->er.last_pic, &h->last_pic_for_ec); COPY_PICTURE(&sl->ref_list[0][0], &h->last_pic_for_ec); } else if (sl->ref_count[0]) { - ff_h264_set_erpic(&h->er.last_pic, &sl->ref_list[0][0]); + ff_h264_set_erpic(&sl->er.last_pic, &sl->ref_list[0][0]); } else - ff_h264_set_erpic(&h->er.last_pic, NULL); + ff_h264_set_erpic(&sl->er.last_pic, NULL); if (sl->ref_count[1]) - ff_h264_set_erpic(&h->er.next_pic, &sl->ref_list[1][0]); + ff_h264_set_erpic(&sl->er.next_pic, &sl->ref_list[1][0]); - h->er.ref_count = sl->ref_count[0]; + sl->er.ref_count = sl->ref_count[0]; - ff_er_frame_end(&h->er); + ff_er_frame_end(&sl->er); if (use_last_pic) memset(&sl->ref_list[0][0], 0, sizeof(h->last_pic_for_ec)); } |