From e61a670b53f4578ab06c2a2d0452518384ac00e5 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Thu, 27 Oct 2011 14:31:42 -0400 Subject: g726: use int16_t instead of short --- libavcodec/g726.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavcodec/g726.c') diff --git a/libavcodec/g726.c b/libavcodec/g726.c index 0f8fe81fc3..6cd8c936ac 100644 --- a/libavcodec/g726.c +++ b/libavcodec/g726.c @@ -353,7 +353,7 @@ static int g726_encode_frame(AVCodecContext *avctx, uint8_t *dst, int buf_size, void *data) { G726Context *c = avctx->priv_data; - const short *samples = data; + const int16_t *samples = data; PutBitContext pb; int i; @@ -375,7 +375,7 @@ static int g726_decode_frame(AVCodecContext *avctx, const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; G726Context *c = avctx->priv_data; - short *samples = data; + int16_t *samples = data; GetBitContext gb; init_get_bits(&gb, buf, buf_size * 8); -- cgit v1.2.3