virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

h264_mb: remove an unused function parameter

Browse Source
This commit is contained in:
Anton Khirnov
2015-01-28 19:49:50 +01:00
parent 2b4c38d3c6
commit 94295106d2
1 changed files with 3 additions and 4 deletions
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" #include "thread.h"
static inline int get_lowest_part_list_y(H264SliceContext *sl, static inline int get_lowest_part_list_y(H264SliceContext *sl,
H264Picture *pic, int n, int n, int height, int y_offset, int list)
int height, int y_offset, int list)
{ {
int raw_my = sl->mv_cache[list][scan8[n]][1]; int raw_my = sl->mv_cache[list][scan8[n]][1];
int filter_height_up = (raw_my & 3) ? 2 : 0; int filter_height_up = (raw_my & 3) ? 2 : 0;
@@ -68,7 +67,7 @@ static inline void get_lowest_part_y(const H264Context *h, H264SliceContext *sl,
// Fields can wait on each other, though. // Fields can wait on each other, though.
if (ref->tf.progress->data != h->cur_pic.tf.progress->data || if (ref->tf.progress->data != h->cur_pic.tf.progress->data ||
(ref->reference & 3) != h->picture_structure) { (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) if (refs[0][ref_n] < 0)
nrefs[0] += 1; nrefs[0] += 1;
refs[0][ref_n] = FFMAX(refs[0][ref_n], my); 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 || if (ref->tf.progress->data != h->cur_pic.tf.progress->data ||
(ref->reference & 3) != h->picture_structure) { (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) if (refs[1][ref_n] < 0)
nrefs[1] += 1; nrefs[1] += 1;
refs[1][ref_n] = FFMAX(refs[1][ref_n], my); refs[1][ref_n] = FFMAX(refs[1][ref_n], my);