RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Replace UNALIGNED_STORES_ARE_BAD with !HAVE_FAST_UNALIGNED 

Originally committed as revision 16364 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård 2008-12-27 23:12:00 +00:00
parent 10f35ebddd
commit 23ae2b68b0
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/bitstream.h
View File

@ -179,10 +179,6 @@ typedef struct RL_VLC_ELEM {
uint8_t run; uint8_t run;
} RL_VLC_ELEM; } 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 #ifndef ALT_BITSTREAM_WRITER
static inline void put_bits(PutBitContext *s, int n, unsigned int value) 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 #ifdef BITSTREAM_WRITER_LE
bit_buf |= value << (32 - bit_left); bit_buf |= value << (32 - bit_left);
if (n >= bit_left) { if (n >= bit_left) {
#ifdef UNALIGNED_STORES_ARE_BAD #ifndef HAVE_FAST_UNALIGNED
if (3 & (intptr_t) s->buf_ptr) { if (3 & (intptr_t) s->buf_ptr) {
s->buf_ptr[0] = bit_buf ; s->buf_ptr[0] = bit_buf ;
s->buf_ptr[1] = bit_buf >> 8; s->buf_ptr[1] = bit_buf >> 8;
@ -221,7 +217,7 @@ static inline void put_bits(PutBitContext *s, int n, unsigned int value)
} else { } else {
bit_buf<<=bit_left; bit_buf<<=bit_left;
bit_buf |= value >> (n - bit_left); bit_buf |= value >> (n - bit_left);
#ifdef UNALIGNED_STORES_ARE_BAD #ifndef HAVE_FAST_UNALIGNED
if (3 & (intptr_t) s->buf_ptr) { if (3 & (intptr_t) s->buf_ptr) {
s->buf_ptr[0] = bit_buf >> 24; s->buf_ptr[0] = bit_buf >> 24;
s->buf_ptr[1] = bit_buf >> 16; s->buf_ptr[1] = bit_buf >> 16;