diff options
| author | Clément Bœsch <u@pkh.me> | 2016-06-19 13:45:59 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2016-06-19 13:45:59 +0200 |
| commit | d5cfe233240dd71536989cd6250bb3e540c5d000 (patch) | |
| tree | 0ad7148864bbb6ee1df33cfce3b3a242ec6773d1 | |
| parent | 222e7d23d0fbcc17fe3d596d768e2aa0fb6e8161 (diff) | |
| parent | 89ae244e78a8d636fbb8427a2da052b04cf710bd (diff) | |
Merge commit '89ae244e78a8d636fbb8427a2da052b04cf710bd'
* commit '89ae244e78a8d636fbb8427a2da052b04cf710bd':
h264_refs: remove an unused parameter from ff_h264_fill_mbaff_ref_list()
Merged-by: Clément Bœsch <u@pkh.me>
| -rw-r--r-- | libavcodec/h264.h | 2 | ||||
| -rw-r--r-- | libavcodec/h264_refs.c | 2 | ||||
| -rw-r--r-- | libavcodec/h264_slice.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 1cb4cd679c..f5a2a90bb1 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 6de532bd20..01eb9db234 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 2ef3065e28..2640c22b7a 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); |