diff options
| author | Måns Rullgård <mans@mansr.com> | 2008-12-27 23:12:00 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2008-12-27 23:12:00 +0000 |
| commit | 23ae2b68b06fea874af9e4f86ddd6941ba51aaa5 (patch) | |
| tree | 1e579e0a5c73b2d389c9c6913a5eb669a0dbfe2f | |
| parent | 10f35ebddd8b32b5eae17fa7cd1f2ace08f3a705 (diff) | |
| download | ffmpeg-23ae2b68b06fea874af9e4f86ddd6941ba51aaa5.tar.gz | |
Replace UNALIGNED_STORES_ARE_BAD with !HAVE_FAST_UNALIGNED
Originally committed as revision 16364 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/bitstream.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libavcodec/bitstream.h b/libavcodec/bitstream.h index 3e8f25ecd2..23bc34de90 100644 --- a/libavcodec/bitstream.h +++ b/libavcodec/bitstream.h @@ -179,10 +179,6 @@ typedef struct RL_VLC_ELEM { uint8_t run; } RL_VLC_ELEM; -#if defined(ARCH_SPARC) || defined(ARCH_ARM) || defined(ARCH_MIPS) || defined(ARCH_BFIN) -#define UNALIGNED_STORES_ARE_BAD -#endif - #ifndef ALT_BITSTREAM_WRITER static inline void put_bits(PutBitContext *s, int n, unsigned int value) { @@ -200,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) { -#ifdef UNALIGNED_STORES_ARE_BAD +#ifndef HAVE_FAST_UNALIGNED if (3 & (intptr_t) s->buf_ptr) { s->buf_ptr[0] = bit_buf ; s->buf_ptr[1] = bit_buf >> 8; @@ -221,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); -#ifdef UNALIGNED_STORES_ARE_BAD +#ifndef HAVE_FAST_UNALIGNED if (3 & (intptr_t) s->buf_ptr) { s->buf_ptr[0] = bit_buf >> 24; s->buf_ptr[1] = bit_buf >> 16; |