From a71abb714e350b017e1e0c1607e343e1e2f2f8a9 Mon Sep 17 00:00:00 2001
From: Jason Garrett-Glaser <darkshikari@gmail.com>
Date: Fri, 23 Jul 2010 10:24:38 +0000
Subject: [PATCH] VP8: shave a few clocks off check_intra_pred_mode

Originally committed as revision 24458 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavcodec/vp8.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c
index 8ff6fbad99..762ba9506c 100644
--- a/libavcodec/vp8.c
+++ b/libavcodec/vp8.c
@@ -929,12 +929,11 @@ void xchg_mb_border(uint8_t *top_border, uint8_t *src_y, uint8_t *src_cb, uint8_
 static int check_intra_pred_mode(int mode, int mb_x, int mb_y)
 {
     if (mode == DC_PRED8x8) {
-        if (!(mb_x|mb_y))
-            mode = DC_128_PRED8x8;
-        else if (!mb_y)
-            mode = LEFT_DC_PRED8x8;
-        else if (!mb_x)
-            mode = TOP_DC_PRED8x8;
+        if (!mb_x) {
+            mode = mb_y ? TOP_DC_PRED8x8 : DC_128_PRED8x8;
+        } else if (!mb_y) {
+            mode = mb_x ? LEFT_DC_PRED8x8 : DC_128_PRED8x8;
+        }
     }
     return mode;
 }