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.h | |
| 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.h')
| -rw-r--r-- | libavcodec/fmtconvert.h | 3 |
1 files changed, 2 insertions, 1 deletions
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. |