[SCM] libav/experimental: Expand some #endif comments.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:52:20 UTC 2013


The following commit has been merged in the experimental branch:
commit e962604f1c9b6038dfbcb0eabbcf071aa90bee77
Author: Diego Biurrun <diego at biurrun.de>
Date:   Mon Oct 16 21:22:47 2006 +0000

    Expand some #endif comments.
    
    Originally committed as revision 6714 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/cabac.h b/libavcodec/cabac.h
index 27869b1..55f6bf6 100644
--- a/libavcodec/cabac.h
+++ b/libavcodec/cabac.h
@@ -522,7 +522,7 @@ static int always_inline get_cabac_inline(CABACContext *c, uint8_t * const state
     );
     bit&=1;
 #endif /* BRANCHLESS_CABAC_DECODER */
-#else /* ARCH_X86 */
+#else /* defined(ARCH_X86) && !(defined(PIC) && defined(__GNUC__)) */
     int s = *state;
     int RangeLPS= ff_h264_lps_range[0][2*(c->range&0xC0) + s];
     int bit, lps_mask attribute_unused;
@@ -561,7 +561,7 @@ static int always_inline get_cabac_inline(CABACContext *c, uint8_t * const state
     if(!(c->low & CABAC_MASK))
         refill2(c);
 #endif /* BRANCHLESS_CABAC_DECODER */
-#endif /* ARCH_X86 */
+#endif /* defined(ARCH_X86) && !(defined(PIC) && defined(__GNUC__)) */
     return bit;
 }
 

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list