virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  fmtconvert: Explicitly use int32_t instead of int

Conflicts:
	libavcodec/ac3dec.c
	libavcodec/fmtconvert.c
	libavcodec/fmtconvert.h

See: f49564c607
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-07-17 10:42:11 +02:00
commit b4fe41c981
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/ac3dec.c
View File

@ -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]; int end_freq = s->end_freq[ch_index];
uint8_t *baps = s->bap[ch_index]; uint8_t *baps = s->bap[ch_index];
int8_t *exps = s->dexps[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]; int dither = (ch_index == CPL_CH) || s->dither_flag[ch_index];
GetBitContext *gbc = &s->gbc; GetBitContext *gbc = &s->gbc;
int freq; int freq;

4
libavcodec/fmtconvert.c
View File

@ -24,7 +24,9 @@
#include "fmtconvert.h" #include "fmtconvert.h"
#include "libavutil/common.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; int i;
for(i=0; i<len; i++) for(i=0; i<len; i++)
dst[i] = src[i] * mul; dst[i] = src[i] * mul;

3
libavcodec/fmtconvert.h
View File

@ -35,7 +35,8 @@ typedef struct FmtConvertContext {
* @param len number of elements to convert. * @param len number of elements to convert.
* constraints: multiple of 8 * 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. * Convert an array of float to an array of int16_t.