[FFmpeg-cvslog] h264/get_lowest_part_list_y: remove unneeded operations

Michael Niedermayer git at videolan.org
Fri Jan 18 15:16:52 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jan 16 01:26:44 2013 +0100| [13178d002bed6e2ad2d99fd086ff88ed126ca086] | committer: Michael Niedermayer

h264/get_lowest_part_list_y: remove unneeded operations

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=13178d002bed6e2ad2d99fd086ff88ed126ca086
---

 libavcodec/h264.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index e1c76e3..f43e99e 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -309,13 +309,13 @@ static inline int get_lowest_part_list_y(H264Context *h, Picture *pic, int n,
                                          int height, int y_offset, int list)
 {
     int raw_my        = h->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(H264Context *h, int refs[2][48], int n,



More information about the ffmpeg-cvslog mailing list