diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2011-10-26 11:08:49 -0400 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2011-10-29 15:16:54 -0400 |
| commit | 425a84350507e18c57ba0bee32366eb5963a9da5 (patch) | |
| tree | 2cac274d0943ac5755dda37cd7e5bcd5f7e12d9a /libavcodec | |
| parent | 4f4e19480a1b254d1d049cffffb11f13ae54b53a (diff) | |
| download | ffmpeg-425a84350507e18c57ba0bee32366eb5963a9da5.tar.gz | |
binkaudio: change short to int16_t
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/binkaudio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c index 742682f1c5..a90467abfb 100644 --- a/libavcodec/binkaudio.c +++ b/libavcodec/binkaudio.c @@ -58,7 +58,7 @@ typedef struct { unsigned int *bands; float root; DECLARE_ALIGNED(32, FFTSample, coeffs)[BINK_BLOCK_MAX_SIZE]; - DECLARE_ALIGNED(16, short, previous)[BINK_BLOCK_MAX_SIZE / 16]; ///< coeffs from previous audio block + DECLARE_ALIGNED(16, int16_t, previous)[BINK_BLOCK_MAX_SIZE / 16]; ///< coeffs from previous audio block DECLARE_ALIGNED(16, int16_t, current)[BINK_BLOCK_MAX_SIZE / 16]; float *coeffs_ptr[MAX_CHANNELS]; ///< pointers to the coeffs arrays for float_to_int16_interleave float *prev_ptr[MAX_CHANNELS]; ///< pointers to the overlap points in the coeffs array @@ -174,7 +174,7 @@ static const uint8_t rle_length_tab[16] = { * @param[out] out Output buffer (must contain s->block_size elements) * @return 0 on success, negative error code on failure */ -static int decode_block(BinkAudioContext *s, short *out, int use_dct) +static int decode_block(BinkAudioContext *s, int16_t *out, int use_dct) { int ch, i, j, k; float q, quant[25]; @@ -307,7 +307,7 @@ static int decode_frame(AVCodecContext *avctx, AVPacket *avpkt) { BinkAudioContext *s = avctx->priv_data; - short *samples = data; + int16_t *samples = data; GetBitContext *gb = &s->gb; int out_size, consumed = 0; |