ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-27 16:50:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '94295106d20b32666a8c4e0d028ef79b9d3f3b7a'

Browse Source 
* commit '94295106d20b32666a8c4e0d028ef79b9d3f3b7a':
  h264_mb: remove an unused function parameter

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-03-21 21:43:03 +01:00
commit e970b576d2
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/h264_mb.c
View File

@ -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);