[SCM] libav/experimental: Update preprocessor directive comments to take recent changes to this file into account.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:58:54 UTC 2013


The following commit has been merged in the experimental branch:
commit f9be0cb800a0dee4a5ace5143ada201b7e6cd85d
Author: Diego Biurrun <diego at biurrun.de>
Date:   Sat Apr 14 09:59:57 2007 +0000

    Update preprocessor directive comments to take recent changes to this file
    into account.
    
    Originally committed as revision 8731 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/cabac.h b/libavcodec/cabac.h
index c96eb0b..d077120 100644
--- a/libavcodec/cabac.h
+++ b/libavcodec/cabac.h
@@ -532,7 +532,7 @@ static int av_always_inline get_cabac_inline(CABACContext *c, uint8_t * const st
     );
     bit&=1;
 #endif /* BRANCHLESS_CABAC_DECODER */
-#else /* defined(ARCH_X86) && !(defined(PIC) && defined(__GNUC__)) */
+#else /* defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE) */
     int s = *state;
     int RangeLPS= ff_h264_lps_range[2*(c->range&0xC0) + s];
     int bit, lps_mask attribute_unused;
@@ -571,7 +571,7 @@ static int av_always_inline get_cabac_inline(CABACContext *c, uint8_t * const st
     if(!(c->low & CABAC_MASK))
         refill2(c);
 #endif /* BRANCHLESS_CABAC_DECODER */
-#endif /* defined(ARCH_X86) && !(defined(PIC) && defined(__GNUC__)) */
+#endif /* defined(ARCH_X86) && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE) */
     return bit;
 }
 
@@ -786,7 +786,7 @@ static int decode_significance_8x8_x86(CABACContext *c, uint8_t *significant_coe
     );
     return coeff_count;
 }
-#endif /* defined(ARCH_X86) && !(defined(PIC) && defined(__GNUC__)) */
+#endif /* defined(ARCH_X86) && && defined(CONFIG_7REGS) && defined(CONFIG_EBX_AVAILABLE) */
 
 /**
  *

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list