diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2011-11-19 17:06:45 -0500 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2011-11-26 16:25:06 -0500 |
| commit | e0722d7fb7595bac12feaae138340af6be358acc (patch) | |
| tree | cbeaf78c6f1b7f1db48cfdaef9e8e5fed02a2caa /libavcodec/adxdec.c | |
| parent | dd1b9f7cd9d80ae5aa691eadbee6315919a91341 (diff) | |
| download | ffmpeg-e0722d7fb7595bac12feaae138340af6be358acc.tar.gz | |
adx: change short to int16_t
Diffstat (limited to 'libavcodec/adxdec.c')
| -rw-r--r-- | libavcodec/adxdec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/adxdec.c b/libavcodec/adxdec.c index 0a9e60118e..dbc42feaa7 100644 --- a/libavcodec/adxdec.c +++ b/libavcodec/adxdec.c @@ -40,7 +40,7 @@ static av_cold int adx_decode_init(AVCodecContext *avctx) /* 18 bytes <-> 32 samples */ -static void adx_decode(short *out,const unsigned char *in, +static void adx_decode(int16_t *out,const unsigned char *in, ADXChannelState *prev) { int scale = AV_RB16(in); @@ -74,7 +74,7 @@ static void adx_decode(short *out,const unsigned char *in, } -static void adx_decode_stereo(short *out,const unsigned char *in, +static void adx_decode_stereo(int16_t *out,const unsigned char *in, ADXChannelState *prev) { short tmp[32*2]; @@ -111,7 +111,7 @@ static int adx_decode_frame(AVCodecContext *avctx, const uint8_t *buf0 = avpkt->data; int buf_size = avpkt->size; ADXContext *c = avctx->priv_data; - short *samples = data; + int16_t *samples = data; const uint8_t *buf = buf0; int rest = buf_size; |