summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2010-05-13 17:58:17 +0000
committerMichael Niedermayer <michaelni@gmx.at>2010-05-13 17:58:17 +0000
commit0628f3e8cfa03b215a6f135c0f11af3ac950ebe4 (patch)
tree0a6ab031dc9f46dde7d1ce69e8c72167a06a2e62
parente969e261a5aab6fee64eda4d21eb4d2deffb755e (diff)
Cast constants to float to avoid gcc converting to and from
float<->double in every operation. Originally committed as revision 23118 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/mpegaudiodec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c
index 89f79f3a52..31966734c5 100644
--- a/libavcodec/mpegaudiodec.c
+++ b/libavcodec/mpegaudiodec.c
@@ -43,8 +43,8 @@
# define SHR(a,b) ((a)*(1.0/(1<<(b))))
# define compute_antialias compute_antialias_float
# define FIXR_OLD(a) ((int)((a) * FRAC_ONE + 0.5))
-# define FIXR(x) (x)
-# define FIXHR(x) (x)
+# define FIXR(x) ((float)(x))
+# define FIXHR(x) ((float)(x))
# define MULH3(x, y, s) ((s)*(y)*(x))
# define MULLx(x, y, s) ((y)*(x))
# define RENAME(a) a ## _float