diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-17 10:42:11 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-17 10:48:56 +0200 |
commit | b4fe41c981de403a65cdf62eac23dd38234d5562 (patch) | |
tree | d61e24dd97345ffde00cd76ec80f1b06fc295c8e /libavcodec/fmtconvert.c | |
parent | 10336ca6400a789e221027923c03400c102e50b9 (diff) | |
parent | b6293e2798afab60596a87010b6163fcb4ca3086 (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fmtconvert: Explicitly use int32_t instead of int
Conflicts:
libavcodec/ac3dec.c
libavcodec/fmtconvert.c
libavcodec/fmtconvert.h
See: f49564c6075935443323abf4571a62205e7b3c59
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/fmtconvert.c')
-rw-r--r-- | libavcodec/fmtconvert.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/fmtconvert.c b/libavcodec/fmtconvert.c index afcbf0d13e..1f07106b7a 100644 --- a/libavcodec/fmtconvert.c +++ b/libavcodec/fmtconvert.c @@ -24,7 +24,9 @@ #include "fmtconvert.h" #include "libavutil/common.h" -static void int32_to_float_fmul_scalar_c(float *dst, const int32_t *src, float mul, int len){ +static void int32_to_float_fmul_scalar_c(float *dst, const int32_t *src, + float mul, int len) +{ int i; for(i=0; i<len; i++) dst[i] = src[i] * mul; |