aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Carlsson <joca@rixmail.se>2003-06-18 22:24:51 +0000
committerMichael Niedermayer <michaelni@gmx.at>2003-06-18 22:24:51 +0000
commit2f4db4d5e53803fedc687c92b834cc7911b98365 (patch)
treed89c283e0096dc1482073d9862d841f6c7738458
parentc009df3f864d0878c25bc6bc692a9f38b176982f (diff)
downloadffmpeg-2f4db4d5e53803fedc687c92b834cc7911b98365.tar.gz
amr typefix patch by (Johannes Carlsson <joca at rixmail dot se>)
Originally committed as revision 1972 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/amr.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/amr.c b/libavformat/amr.c
index 720bf31f55..4baa427ea3 100644
--- a/libavformat/amr.c
+++ b/libavformat/amr.c
@@ -81,7 +81,7 @@ static int amr_read_header(AVFormatContext *s,
{
ByteIOContext *pb = &s->pb;
AVStream *st;
- u_int8_t header[6];
+ uint8_t header[6];
get_buffer(pb, header, 6);
@@ -107,8 +107,8 @@ static int amr_read_header(AVFormatContext *s,
static int amr_read_packet(AVFormatContext *s,
AVPacket *pkt)
{
- static u_int16_t packed_size[16] = {12, 13, 15, 17, 19, 20, 26, 31, 5, 0, 0, 0, 0, 0, 0, 0};
- u_int8_t toc, q, ft;
+ static uint16_t packed_size[16] = {12, 13, 15, 17, 19, 20, 26, 31, 5, 0, 0, 0, 0, 0, 0, 0};
+ uint8_t toc, q, ft;
int read;
int size;