aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2013-10-13 20:21:03 +0000
committerPaul B Mahol <onemda@gmail.com>2013-10-13 20:21:03 +0000
commit5340c3dd8d2ae14dc1f1df880f3c0857f2ec8c00 (patch)
tree825f3b003f262c70740e45049ac89040d40ad93e
parenta807c68253b02cce8b9fbc87d7857c31d531a1ee (diff)
downloadffmpeg-5340c3dd8d2ae14dc1f1df880f3c0857f2ec8c00.tar.gz
avformat/westwood_vqa: s/unsigned char/uint8_t & s/unsigned int/uint32_t
Signed-off-by: Paul B Mahol <onemda@gmail.com>
-rw-r--r--libavformat/westwood_vqa.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/libavformat/westwood_vqa.c b/libavformat/westwood_vqa.c
index 2e72928a4c..1d4bb5ad6c 100644
--- a/libavformat/westwood_vqa.c
+++ b/libavformat/westwood_vqa.c
@@ -81,10 +81,10 @@ static int wsvqa_read_header(AVFormatContext *s)
WsVqaDemuxContext *wsvqa = s->priv_data;
AVIOContext *pb = s->pb;
AVStream *st;
- unsigned char *header;
- unsigned char scratch[VQA_PREAMBLE_SIZE];
- unsigned int chunk_tag;
- unsigned int chunk_size;
+ uint8_t *header;
+ uint8_t scratch[VQA_PREAMBLE_SIZE];
+ uint32_t chunk_tag;
+ uint32_t chunk_size;
int fps;
/* initialize the video decoder stream */
@@ -103,7 +103,7 @@ static int wsvqa_read_header(AVFormatContext *s)
/* the VQA header needs to go to the decoder */
if (ff_alloc_extradata(st->codec, VQA_HEADER_SIZE))
return AVERROR(ENOMEM);
- header = (unsigned char *)st->codec->extradata;
+ header = (uint8_t *)st->codec->extradata;
if (avio_read(pb, st->codec->extradata, VQA_HEADER_SIZE) !=
VQA_HEADER_SIZE) {
return AVERROR(EIO);
@@ -166,9 +166,9 @@ static int wsvqa_read_packet(AVFormatContext *s,
WsVqaDemuxContext *wsvqa = s->priv_data;
AVIOContext *pb = s->pb;
int ret = -1;
- unsigned char preamble[VQA_PREAMBLE_SIZE];
- unsigned int chunk_type;
- unsigned int chunk_size;
+ uint8_t preamble[VQA_PREAMBLE_SIZE];
+ uint32_t chunk_type;
+ uint32_t chunk_size;
int skip_byte;
while (avio_read(pb, preamble, VQA_PREAMBLE_SIZE) == VQA_PREAMBLE_SIZE) {