diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 21:43:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 21:43:07 +0100 |
| commit | e970b576d28dd515d4ccd665b53763e228816cac (patch) | |
| tree | 7a79da8e4c6634777f7f24d0eaf1f41e66fee53d /libavcodec/h264_mb.c | |
| parent | 8c6370afe3437e7f3e6398faa721f8f3e0a1e034 (diff) | |
| parent | 94295106d20b32666a8c4e0d028ef79b9d3f3b7a (diff) | |
Merge commit '94295106d20b32666a8c4e0d028ef79b9d3f3b7a'
* commit '94295106d20b32666a8c4e0d028ef79b9d3f3b7a':
h264_mb: remove an unused function parameter
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_mb.c')
| -rw-r--r-- | libavcodec/h264_mb.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libavcodec/h264_mb.c b/libavcodec/h264_mb.c index 7c08fae756..f2892710d7 100644 --- a/libavcodec/h264_mb.c +++ b/libavcodec/h264_mb.c @@ -37,8 +37,7 @@ #include "thread.h" static inline int get_lowest_part_list_y(H264SliceContext *sl, - H264Picture *pic, int n, - int height, int y_offset, int list) + int n, int height, int y_offset, int list) { int raw_my = sl->mv_cache[list][scan8[n]][1]; int filter_height_down = (raw_my & 3) ? 3 : 0; @@ -68,7 +67,7 @@ static inline void get_lowest_part_y(const H264Context *h, H264SliceContext *sl, // Fields can wait on each other, though. if (ref->tf.progress->data != h->cur_pic.tf.progress->data || (ref->reference & 3) != h->picture_structure) { - my = get_lowest_part_list_y(sl, ref, n, height, y_offset, 0); + my = get_lowest_part_list_y(sl, n, height, y_offset, 0); if (refs[0][ref_n] < 0) nrefs[0] += 1; refs[0][ref_n] = FFMAX(refs[0][ref_n], my); @@ -81,7 +80,7 @@ static inline void get_lowest_part_y(const H264Context *h, H264SliceContext *sl, if (ref->tf.progress->data != h->cur_pic.tf.progress->data || (ref->reference & 3) != h->picture_structure) { - my = get_lowest_part_list_y(sl, ref, n, height, y_offset, 1); + my = get_lowest_part_list_y(sl, n, height, y_offset, 1); if (refs[1][ref_n] < 0) nrefs[1] += 1; refs[1][ref_n] = FFMAX(refs[1][ref_n], my); |