[SCM] libav/experimental: Simplify spatial direct ref selection with FFMIN3()
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:25:44 UTC 2013
The following commit has been merged in the experimental branch:
commit 29d05ebc7a24e7d0a736c43cc7906e65b2929798
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Mon Jul 21 01:41:56 2008 +0000
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 4d3d32b..7fa1b07 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;
}
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list