Simplify if(), 3 cpu cycles faster in pentium dual.

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@16272 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 30d7b748ea2a3ef001732f9c2f33d3da400fade6..7605958a36efd2614bbbc076de5d1f473c9e1ccf 100644 (file)
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -5314,10 +5314,8 @@ static inline void compute_mb_neighbors(H264Context *h)
         const int left_mb_frame_flag = !IS_INTERLACED(s->current_picture.mb_type[pair_xy-1]);
         const int curr_mb_frame_flag = !MB_FIELD;
         const int bottom = (s->mb_y & 1);
-        if (bottom
-                ? !curr_mb_frame_flag // bottom macroblock
-                : (!curr_mb_frame_flag && !top_mb_frame_flag) // top macroblock
-                ) {
+
+        if (!curr_mb_frame_flag && (bottom || !top_mb_frame_flag)){
             h->top_mb_xy -= s->mb_stride;
         }
         if (left_mb_frame_flag != curr_mb_frame_flag) {