diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-08 02:32:45 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-08 02:32:45 +0300 |
commit | e3103ea06f62eda3afd3e8eb2202e54871dc0e93 (patch) | |
tree | cc73fe5254d6394e870980eb7bca8ae26ca30811 /ffmpeg_files/intreadwrite.h | |
parent | 5266b5de98aa57dd99bb1f1ac5a40ebf4f23b7c2 (diff) | |
download | mpv-e3103ea06f62eda3afd3e8eb2202e54871dc0e93.tar.bz2 mpv-e3103ea06f62eda3afd3e8eb2202e54871dc0e93.tar.xz |
intreadwrite.h: disable optimizations
Disable arch/compiler specific optimizations in the MPlayer version of
intreadwrite.h. All the uses in MPlayer should be irrelevant for
performance.
Diffstat (limited to 'ffmpeg_files/intreadwrite.h')
-rw-r--r-- | ffmpeg_files/intreadwrite.h | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/ffmpeg_files/intreadwrite.h b/ffmpeg_files/intreadwrite.h index bc61ccceb7..ff4e917e46 100644 --- a/ffmpeg_files/intreadwrite.h +++ b/ffmpeg_files/intreadwrite.h @@ -23,46 +23,6 @@ #include "config.h" #include "bswap.h" -/* - * Arch-specific headers can provide any combination of - * AV_[RW][BLN](16|32|64) macros. Preprocessor symbols must be - * defined, even if these are implemented as inline functions. - */ - -#if ARCH_ARM -# include "arm/intreadwrite.h" -#elif ARCH_MIPS -# include "mips/intreadwrite.h" -#elif ARCH_PPC -# include "ppc/intreadwrite.h" -#endif - -/* - * Define AV_[RW]N helper macros to simplify definitions not provided - * by per-arch headers. - */ - -#if defined(__GNUC__) - -struct unaligned_64 { uint64_t l; } __attribute__((packed)); -struct unaligned_32 { uint32_t l; } __attribute__((packed)); -struct unaligned_16 { uint16_t l; } __attribute__((packed)); - -# define AV_RN(s, p) (((const struct unaligned_##s *) (p))->l) -# define AV_WN(s, p, v) (((struct unaligned_##s *) (p))->l) = (v) - -#elif defined(__DECC) - -# define AV_RN(s, p) (*((const __unaligned uint##s##_t*)(p))) -# define AV_WN(s, p, v) *((__unaligned uint##s##_t*)(p)) = (v) - -#elif HAVE_FAST_UNALIGNED - -# define AV_RN(s, p) (*((const uint##s##_t*)(p))) -# define AV_WN(s, p, v) *((uint##s##_t*)(p)) = (v) - -#else - #ifndef AV_RB16 #define AV_RB16(x) ((((const uint8_t*)(x))[0] << 8) | \ ((const uint8_t*)(x))[1]) @@ -163,8 +123,6 @@ struct unaligned_16 { uint16_t l; } __attribute__((packed)); # define AV_WN(s, p, v) AV_WL##s(p, v) #endif -#endif /* HAVE_FAST_UNALIGNED */ - #ifndef AV_RN16 # define AV_RN16(p) AV_RN(16, p) #endif |