diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-31 04:52:15 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-31 04:52:15 +0200 |
| commit | ccf4d9e96cd7aa8506e6632d2a7352ec89b2b9e3 (patch) | |
| tree | a5f3a6d636e96f05bb52f0b2407107a7f0c8b443 /libaf | |
| parent | 03aa64687fc109c5f2346a3c191b70698b333509 (diff) | |
| parent | 0e77da241da8b911c96a0e22898e84d7f7b74678 (diff) | |
| download | mpv-ccf4d9e96cd7aa8506e6632d2a7352ec89b2b9e3.tar.bz2 mpv-ccf4d9e96cd7aa8506e6632d2a7352ec89b2b9e3.tar.xz | |
Merge svn changes up to r28403
Diffstat (limited to 'libaf')
| -rw-r--r-- | libaf/af.h | 2 | ||||
| -rw-r--r-- | libaf/af_format.c | 13 | ||||
| -rw-r--r-- | libaf/af_format.h | 2 |
3 files changed, 5 insertions, 12 deletions
diff --git a/libaf/af.h b/libaf/af.h index 14c3accb12..f5967d8bee 100644 --- a/libaf/af.h +++ b/libaf/af.h @@ -93,7 +93,7 @@ extern int* af_cpu_speed; // Default init type #ifndef AF_INIT_TYPE -#if HAVE_SSE || HAVE_3DNOW +#if HAVE_SSE || HAVE_AMD3DNOW #define AF_INIT_TYPE (af_cpu_speed?*af_cpu_speed:AF_INIT_FAST) #else #define AF_INIT_TYPE (af_cpu_speed?*af_cpu_speed:AF_INIT_SLOW) diff --git a/libaf/af_format.c b/libaf/af_format.c index 5e53c1ae99..df4dac2841 100644 --- a/libaf/af_format.c +++ b/libaf/af_format.c @@ -25,16 +25,9 @@ #include <string.h> #include <inttypes.h> #include <limits.h> - -#include "config.h" -// Integer to float conversion through lrintf() -#if HAVE_LRINTF #include <math.h> -long int lrintf(float); -#else -#define lrintf(x) ((int)(x)) -#endif +#include "config.h" #include "af.h" #include "mpbswap.h" #include "libvo/fastmemcpy.h" @@ -339,7 +332,7 @@ af_info_t af_info_format = { }; static inline uint32_t load24bit(void* data, int pos) { -#if WORDS_BIGENDIAN +#ifdef WORDS_BIGENDIAN return (((uint32_t)((uint8_t*)data)[3*pos])<<24) | (((uint32_t)((uint8_t*)data)[3*pos+1])<<16) | (((uint32_t)((uint8_t*)data)[3*pos+2])<<8); @@ -351,7 +344,7 @@ static inline uint32_t load24bit(void* data, int pos) { } static inline void store24bit(void* data, int pos, uint32_t expanded_value) { -#if WORDS_BIGENDIAN +#ifdef WORDS_BIGENDIAN ((uint8_t*)data)[3*pos]=expanded_value>>24; ((uint8_t*)data)[3*pos+1]=expanded_value>>16; ((uint8_t*)data)[3*pos+2]=expanded_value>>8; diff --git a/libaf/af_format.h b/libaf/af_format.h index 49a25374ae..553d18d962 100644 --- a/libaf/af_format.h +++ b/libaf/af_format.h @@ -30,7 +30,7 @@ #define AF_FORMAT_LE (1<<0) // Little Endian #define AF_FORMAT_END_MASK (1<<0) -#if WORDS_BIGENDIAN // Native endian of cpu +#ifdef WORDS_BIGENDIAN // Native endian of cpu #define AF_FORMAT_NE AF_FORMAT_BE #else #define AF_FORMAT_NE AF_FORMAT_LE |