Commit b4fe41c9 authored by Michael Niedermayer's avatar Michael Niedermayer

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: f49564c6Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 10336ca6 b6293e27
......@@ -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;
......
......@@ -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.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment