ffmpeg | branch: master | Clément Bœsch <[email protected]> | Sun Jun 19 13:45:59 2016 +0200| [d5cfe233240dd71536989cd6250bb3e540c5d000] | committer: Clément Bœsch
Merge commit '89ae244e78a8d636fbb8427a2da052b04cf710bd' * commit '89ae244e78a8d636fbb8427a2da052b04cf710bd': h264_refs: remove an unused parameter from ff_h264_fill_mbaff_ref_list() Merged-by: Clément Bœsch <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d5cfe233240dd71536989cd6250bb3e540c5d000 --- libavcodec/h264.h | 2 +- libavcodec/h264_refs.c | 2 +- libavcodec/h264_slice.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 1cb4cd6..f5a2a90 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -731,7 +731,7 @@ int ff_h264_get_slice_type(const H264SliceContext *sl); int ff_h264_alloc_tables(H264Context *h); int ff_h264_decode_ref_pic_list_reordering(H264Context *h, H264SliceContext *sl); -void ff_h264_fill_mbaff_ref_list(H264Context *h, H264SliceContext *sl); +void ff_h264_fill_mbaff_ref_list(H264SliceContext *sl); void ff_h264_remove_all_refs(H264Context *h); /** diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index 6de532b..01eb9db 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -401,7 +401,7 @@ int ff_h264_decode_ref_pic_list_reordering(H264Context *h, H264SliceContext *sl) return 0; } -void ff_h264_fill_mbaff_ref_list(H264Context *h, H264SliceContext *sl) +void ff_h264_fill_mbaff_ref_list(H264SliceContext *sl) { int list, i, j; for (list = 0; list < sl->list_count; list++) { diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 2ef3065..2640c22 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1680,7 +1680,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) } if (FRAME_MBAFF(h)) { - ff_h264_fill_mbaff_ref_list(h, sl); + ff_h264_fill_mbaff_ref_list(sl); if (pps->weighted_bipred_idc == 2 && sl->slice_type_nos == AV_PICTURE_TYPE_B) { implicit_weight_table(h, sl, 0); ====================================================================== diff --cc libavcodec/h264.h index 1cb4cd6,f551d79..f5a2a90 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@@ -730,8 -686,8 +730,8 @@@ int ff_h264_get_slice_type(const H264Sl */ int ff_h264_alloc_tables(H264Context *h); -int ff_h264_decode_ref_pic_list_reordering(const H264Context *h, H264SliceContext *sl); +int ff_h264_decode_ref_pic_list_reordering(H264Context *h, H264SliceContext *sl); - void ff_h264_fill_mbaff_ref_list(H264Context *h, H264SliceContext *sl); + void ff_h264_fill_mbaff_ref_list(H264SliceContext *sl); void ff_h264_remove_all_refs(H264Context *h); /** diff --cc libavcodec/h264_refs.c index 6de532b,8552487..01eb9db --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@@ -401,10 -352,10 +401,10 @@@ int ff_h264_decode_ref_pic_list_reorder return 0; } - void ff_h264_fill_mbaff_ref_list(H264Context *h, H264SliceContext *sl) + void ff_h264_fill_mbaff_ref_list(H264SliceContext *sl) { int list, i, j; - for (list = 0; list < sl->list_count; list++) { //FIXME try list_count + for (list = 0; list < sl->list_count; list++) { for (i = 0; i < sl->ref_count[list]; i++) { H264Ref *frame = &sl->ref_list[list][i]; H264Ref *field = &sl->ref_list[list][16 + 2 * i]; _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
