[FFmpeg-cvslog] h264: move a per-field block from decode_slice_header() to field_start()
Anton Khirnov
git at videolan.org
Fri Jul 29 11:24:06 EEST 2016
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Tue May 17 19:00:18 2016 +0200| [bcd91f1644b46dd142c5355c8b742b27d9028903] | committer: Anton Khirnov
h264: move a per-field block from decode_slice_header() to field_start()
This is a more appropriate place for it.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bcd91f1644b46dd142c5355c8b742b27d9028903
---
libavcodec/h264_slice.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index 990c85b..ec8a82c 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -1167,6 +1167,13 @@ static int h264_field_start(H264Context *h, const H264SliceContext *sl,
release_unused_pictures(h, 0);
}
+ ff_h264_init_poc(h->cur_pic_ptr->field_poc, &h->cur_pic_ptr->poc,
+ h->ps.sps, &h->poc, h->picture_structure, nal->ref_idc);
+
+ memcpy(h->mmco, sl->mmco, sl->nb_mmco * sizeof(*h->mmco));
+ h->nb_mmco = sl->nb_mmco;
+ h->explicit_ref_marking = sl->explicit_ref_marking;
+
return 0;
}
@@ -1437,15 +1444,6 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl,
sl->resync_mb_y = sl->mb_y = sl->mb_y + 1;
assert(sl->mb_y < h->mb_height);
- if (!h->setup_finished) {
- ff_h264_init_poc(h->cur_pic_ptr->field_poc, &h->cur_pic_ptr->poc,
- h->ps.sps, &h->poc, h->picture_structure, nal->ref_idc);
-
- memcpy(h->mmco, sl->mmco, sl->nb_mmco * sizeof(*h->mmco));
- h->nb_mmco = sl->nb_mmco;
- h->explicit_ref_marking = sl->explicit_ref_marking;
- }
-
ret = ff_h264_build_ref_list(h, sl);
if (ret < 0)
return ret;
More information about the ffmpeg-cvslog
mailing list