From: Michael Niedermayer <michaelni@gmx.at>
Date: Mon, 21 Jul 2008 01:41:56 +0000 (+0000)
Subject: Simplify spatial direct ref selection with FFMIN3()
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=29d05ebc7a24e7d0a736c43cc7906e65b2929798;p=ffmpeg

Simplify spatial direct ref selection with FFMIN3()

Originally committed as revision 14319 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 4d3d32b0e2a..7fa1b074737 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1001,11 +1001,7 @@ static inline void pred_direct_motion(H264Context * const h, int *mb_type){
             int refc = h->ref_cache[list][scan8[0] - 8 + 4];
             if(refc == -2)
                 refc = h->ref_cache[list][scan8[0] - 8 - 1];
-            ref[list] = refa;
-            if(ref[list] < 0 || (refb < ref[list] && refb >= 0))
-                ref[list] = refb;
-            if(ref[list] < 0 || (refc < ref[list] && refc >= 0))
-                ref[list] = refc;
+            ref[list] = FFMIN3((unsigned)refa, (unsigned)refb, (unsigned)refc);
             if(ref[list] < 0)
                 ref[list] = -1;
         }