diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-13 23:44:16 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-13 23:44:16 +0000 |
| commit | b250f9c66d3ddd84652d158fb979a5f21e3f2c71 (patch) | |
| tree | ef84366029d6f8af6ed82e90c5f188bb7dfc844d /libavcodec/bitstream.h | |
| parent | 959da985b03570cfe7d239c0ba6d550ecb04c460 (diff) | |
| download | ffmpeg-b250f9c66d3ddd84652d158fb979a5f21e3f2c71.tar.gz | |
Change semantic of CONFIG_*, HAVE_* and ARCH_*.
They are now always defined to either 0 or 1.
Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/bitstream.h')
| -rw-r--r-- | libavcodec/bitstream.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/bitstream.h b/libavcodec/bitstream.h index 23bc34de90..0f8110612a 100644 --- a/libavcodec/bitstream.h +++ b/libavcodec/bitstream.h @@ -41,7 +41,7 @@ //#define ALT_BITSTREAM_WRITER //#define ALIGNED_BITSTREAM_WRITER #if !defined(LIBMPEG2_BITSTREAM_READER) && !defined(A32_BITSTREAM_READER) && !defined(ALT_BITSTREAM_READER) -# ifdef ARCH_ARM +# if ARCH_ARM # define A32_BITSTREAM_READER # else # define ALT_BITSTREAM_READER @@ -52,7 +52,7 @@ extern const uint8_t ff_reverse[256]; -#if defined(ARCH_X86) +#if ARCH_X86 // avoid +32 for shift optimization (gcc should do that ...) static inline int32_t NEG_SSR32( int32_t a, int8_t s){ __asm__ ("sarl %1, %0\n\t" @@ -196,7 +196,7 @@ static inline void put_bits(PutBitContext *s, int n, unsigned int value) #ifdef BITSTREAM_WRITER_LE bit_buf |= value << (32 - bit_left); if (n >= bit_left) { -#ifndef HAVE_FAST_UNALIGNED +#if !HAVE_FAST_UNALIGNED if (3 & (intptr_t) s->buf_ptr) { s->buf_ptr[0] = bit_buf ; s->buf_ptr[1] = bit_buf >> 8; @@ -217,7 +217,7 @@ static inline void put_bits(PutBitContext *s, int n, unsigned int value) } else { bit_buf<<=bit_left; bit_buf |= value >> (n - bit_left); -#ifndef HAVE_FAST_UNALIGNED +#if !HAVE_FAST_UNALIGNED if (3 & (intptr_t) s->buf_ptr) { s->buf_ptr[0] = bit_buf >> 24; s->buf_ptr[1] = bit_buf >> 16; @@ -243,7 +243,7 @@ static inline void put_bits(PutBitContext *s, int n, unsigned int value) static inline void put_bits(PutBitContext *s, int n, unsigned int value) { # ifdef ALIGNED_BITSTREAM_WRITER -# if defined(ARCH_X86) +# if ARCH_X86 __asm__ volatile( "movl %0, %%ecx \n\t" "xorl %%eax, %%eax \n\t" @@ -274,7 +274,7 @@ static inline void put_bits(PutBitContext *s, int n, unsigned int value) s->index= index; # endif # else //ALIGNED_BITSTREAM_WRITER -# if defined(ARCH_X86) +# if ARCH_X86 __asm__ volatile( "movl $7, %%ecx \n\t" "andl %0, %%ecx \n\t" @@ -550,7 +550,7 @@ static inline void skip_bits_long(GetBitContext *s, int n){ name##_bit_count-= 32;\ }\ -#if defined(ARCH_X86) +#if ARCH_X86 # define SKIP_CACHE(name, gb, num)\ __asm__(\ "shldl %2, %1, %0 \n\t"\ |