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 | |
| parent | 10336ca6400a789e221027923c03400c102e50b9 (diff) | |
| parent | b6293e2798afab60596a87010b6163fcb4ca3086 (diff) | |
| download | ffmpeg-b4fe41c981de403a65cdf62eac23dd38234d5562.tar.gz | |
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>
| -rw-r--r-- | libavcodec/ac3dec.c | 2 | ||||
| -rw-r--r-- | libavcodec/fmtconvert.c | 4 | ||||
| -rw-r--r-- | libavcodec/fmtconvert.h | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index 4d38ca1e22..fc15a41c74 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -429,7 +429,7 @@ static void ac3_decode_transform_coeffs_ch(AC3DecodeContext *s, int ch_index, ma int end_freq = s->end_freq[ch_index]; uint8_t *baps = s->bap[ch_index]; int8_t *exps = s->dexps[ch_index]; - int32_t *coeffs = s->fixed_coeffs[ch_index]; + int32_t *coeffs = s->fixed_coeffs[ch_index]; int dither = (ch_index == CPL_CH) || s->dither_flag[ch_index]; GetBitContext *gbc = &s->gbc; int freq; 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; diff --git a/libavcodec/fmtconvert.h b/libavcodec/fmtconvert.h index ea04489a7d..1d48ba142b 100644 --- a/libavcodec/fmtconvert.h +++ b/libavcodec/fmtconvert.h @@ -35,7 +35,8 @@ typedef struct FmtConvertContext { * @param len number of elements to convert. * constraints: multiple of 8 */ - void (*int32_to_float_fmul_scalar)(float *dst, const int32_t *src, float mul, int len); + void (*int32_to_float_fmul_scalar)(float *dst, const int32_t *src, + float mul, int len); /** * Convert an array of float to an array of int16_t. |