[FFmpeg-cvslog] g726: use int16_t instead of short

[Justin Ruggles]

ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Thu Oct 27 14:31:42 2011 -0400| [e61a670b53f4578ab06c2a2d0452518384ac00e5] | committer: Justin Ruggles

g726: use int16_t instead of short

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e61a670b53f4578ab06c2a2d0452518384ac00e5
---

 libavcodec/g726.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/g726.c b/libavcodec/g726.c
index 0f8fe81..6cd8c93 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);