Merge commit '94295106d20b32666a8c4e0d028ef79b9d3f3b7a'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 20:43:03 +0000 (21:43 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 20:43:07 +0000 (21:43 +0100)
* commit '94295106d20b32666a8c4e0d028ef79b9d3f3b7a':
  h264_mb: remove an unused function parameter

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/h264_mb.c

  #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_up   = (raw_my & 3) ? 2 : 0;
      int filter_height_down = (raw_my & 3) ? 3 : 0;
      int full_my            = (raw_my >> 2) + y_offset;
 -    int top                = full_my - filter_height_up;
      int bottom             = full_my + filter_height_down + height;
  
 -    return FFMAX(abs(top), bottom);
 +    av_assert2(height >= 0);
 +
 +    return FFMAX(0, bottom);
  }
  
  static inline void get_lowest_part_y(const H264Context *h, H264SliceContext *sl,