[SCM] libav/experimental: Simplify if()

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:59:55 UTC 2013


The following commit has been merged in the experimental branch:
commit 5134ad53ed07117f14ab192e059da0b1bb7c017a
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sat Feb 13 13:28:04 2010 +0000

    Simplify if()
    
    Originally committed as revision 21791 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c
index 0c08e1d..bf944a1 100644
--- a/libavcodec/h264_direct.c
+++ b/libavcodec/h264_direct.c
@@ -207,7 +207,7 @@ static void pred_spatial_direct_motion(H264Context * const h, int *mb_type){
         sub_mb_type |= MB_TYPE_L0L1;
     }
 
-    if(!is_b8x8 && (mv[0]|mv[1]) == 0){
+    if(!(is_b8x8|mv[0]|mv[1])){
         fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, (uint8_t)ref[0], 1);
         fill_rectangle(&h->ref_cache[1][scan8[0]], 4, 4, 8, (uint8_t)ref[1], 1);
         fill_rectangle(&h->mv_cache[0][scan8[0]], 4, 4, 8, 0, 4);

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list