diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2006-08-22 11:16:47 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2006-08-22 11:16:47 +0000 |
| commit | 5ab1972b53b779c8715322a2ec11aa60cbcda9c6 (patch) | |
| tree | e24778049a2458fe1be6b678f93a679e6e4d4c7a | |
| parent | 355903f5a8ba254b439903a77d75f1d9c0d3f092 (diff) | |
| download | ffmpeg-5ab1972b53b779c8715322a2ec11aa60cbcda9c6.tar.gz | |
indent preprocessor directives
Originally committed as revision 6047 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/mpegaudiodec.c | 51 |
1 files changed, 23 insertions, 28 deletions
diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c index 9593e03480..5f6cf915fe 100644 --- a/libavcodec/mpegaudiodec.c +++ b/libavcodec/mpegaudiodec.c @@ -36,7 +36,7 @@ /* define USE_HIGHPRECISION to have a bit exact (but slower) mpeg audio decoder */ #ifdef CONFIG_MPEGAUDIO_HP -#define USE_HIGHPRECISION +# define USE_HIGHPRECISION #endif #include "mpegaudio.h" @@ -750,26 +750,21 @@ static inline int round_sample(int *sum) return sum1; } -#if defined(ARCH_POWERPC_405) - -/* signed 16x16 -> 32 multiply add accumulate */ -#define MACS(rt, ra, rb) \ - asm ("maclhw %0, %2, %3" : "=r" (rt) : "0" (rt), "r" (ra), "r" (rb)); - -/* signed 16x16 -> 32 multiply */ -#define MULS(ra, rb) \ - ({ int __rt; asm ("mullhw %0, %1, %2" : "=r" (__rt) : "r" (ra), "r" (rb)); __rt; }) - -#else - -/* signed 16x16 -> 32 multiply add accumulate */ -#define MACS(rt, ra, rb) rt += (ra) * (rb) - -/* signed 16x16 -> 32 multiply */ -#define MULS(ra, rb) ((ra) * (rb)) - -#endif - +# if defined(ARCH_POWERPC_405) + /* signed 16x16 -> 32 multiply add accumulate */ +# define MACS(rt, ra, rb) \ + asm ("maclhw %0, %2, %3" : "=r" (rt) : "0" (rt), "r" (ra), "r" (rb)); + + /* signed 16x16 -> 32 multiply */ +# define MULS(ra, rb) \ + ({ int __rt; asm ("mullhw %0, %1, %2" : "=r" (__rt) : "r" (ra), "r" (rb)); __rt; }) +# else + /* signed 16x16 -> 32 multiply add accumulate */ +# define MACS(rt, ra, rb) rt += (ra) * (rb) + + /* signed 16x16 -> 32 multiply */ +# define MULS(ra, rb) ((ra) * (rb)) +# endif #else static inline int round_sample(int64_t *sum) @@ -784,13 +779,13 @@ static inline int round_sample(int64_t *sum) return sum1; } -#ifdef ARCH_X86 -/* ask gcc devels why this is 3 times faster then the generic code below */ -#define MULS(ra, rb) \ - ({ int64_t rt; asm ("imull %2\n\t" : "=A"(rt) : "a" (ra), "g" (rb)); rt; }) -#else -#define MULS(ra, rb) MUL64(ra, rb) -#endif +# ifdef ARCH_X86 + /* ask gcc devels why this is 3 times faster then the generic code below */ +# define MULS(ra, rb) \ + ({ int64_t rt; asm ("imull %2\n\t" : "=A"(rt) : "a" (ra), "g" (rb)); rt; }) +# else +# define MULS(ra, rb) MUL64(ra, rb) +# endif #endif #define SUM8(sum, op, w, p) \ |