aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Melanson <mike@multimedia.cx>2004-11-20 23:53:24 +0000
committerMike Melanson <mike@multimedia.cx>2004-11-20 23:53:24 +0000
commite4917f59a5406aff1e11ed86d61e710807ff48e9 (patch)
treeb7c4ea31d798893c6fda2af9ae1a1d570532e8af
parent353147ed5d7f26c40d7e1162f9953470e6b37bb9 (diff)
downloadffmpeg-e4917f59a5406aff1e11ed86d61e710807ff48e9.tar.gz
use correct types
Originally committed as revision 3698 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/nsvdec.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c
index fbec970f49..3295e34373 100644
--- a/libavformat/nsvdec.c
+++ b/libavformat/nsvdec.c
@@ -233,7 +233,7 @@ static int nsv_resync(AVFormatContext *s)
{
NSVContext *nsv = s->priv_data;
ByteIOContext *pb = &s->pb;
- uint32 v = 0;
+ uint32_t v = 0;
int i;
PRINT(("%s(), offset = %Ld, state = %d\n", __FUNCTION__, url_ftell(pb), nsv->state));
@@ -541,13 +541,13 @@ static int nsv_read_chunk(AVFormatContext *s, int fill_header)
AVStream *st[2] = {NULL, NULL};
NSVStream *nst;
AVPacket *pkt;
- uint32 v = 0;
+ uint32_t v = 0;
int i, err = 0;
- uint8 auxcount; /* number of aux metadata, also 4 bits of vsize */
- uint32 vsize;
- uint16 asize;
- uint16 auxsize;
- uint32 auxtag;
+ uint8_t auxcount; /* number of aux metadata, also 4 bits of vsize */
+ uint32_t vsize;
+ uint16_t asize;
+ uint16_t auxsize;
+ uint32_t auxtag;
PRINT(("%s(%d)\n", __FUNCTION__, fill_header));
@@ -586,7 +586,7 @@ null_chunk_retry:
((auxtag >> 24) & 0x0ff),
auxsize));
url_fskip(pb, auxsize);
- vsize -= auxsize + sizeof(uint16) + sizeof(uint32); /* that's becoming braindead */
+ vsize -= auxsize + sizeof(uint16_t) + sizeof(uint32_t); /* that's becoming braindead */
}
if (url_feof(pb))