RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/westwood_vqa: s/unsigned char/uint8_t & s/unsigned int/uint32_t 

Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2013-10-13 20:21:03 +00:00
parent a807c68253
commit 5340c3dd8d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavformat/westwood_vqa.c
View File

@ -81,10 +81,10 @@ static int wsvqa_read_header(AVFormatContext *s)
WsVqaDemuxContext *wsvqa = s->priv_data; WsVqaDemuxContext *wsvqa = s->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
AVStream *st; AVStream *st;
unsigned char *header; uint8_t *header;
unsigned char scratch[VQA_PREAMBLE_SIZE]; uint8_t scratch[VQA_PREAMBLE_SIZE];
unsigned int chunk_tag; uint32_t chunk_tag;
unsigned int chunk_size; uint32_t chunk_size;
int fps; int fps;
/* initialize the video decoder stream */ /* 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 */ /* the VQA header needs to go to the decoder */
if (ff_alloc_extradata(st->codec, VQA_HEADER_SIZE)) if (ff_alloc_extradata(st->codec, VQA_HEADER_SIZE))
return AVERROR(ENOMEM); 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) != if (avio_read(pb, st->codec->extradata, VQA_HEADER_SIZE) !=
VQA_HEADER_SIZE) { VQA_HEADER_SIZE) {
return AVERROR(EIO); return AVERROR(EIO);
@ -166,9 +166,9 @@ static int wsvqa_read_packet(AVFormatContext *s,
WsVqaDemuxContext *wsvqa = s->priv_data; WsVqaDemuxContext *wsvqa = s->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
int ret = -1; int ret = -1;
unsigned char preamble[VQA_PREAMBLE_SIZE]; uint8_t preamble[VQA_PREAMBLE_SIZE];
unsigned int chunk_type; uint32_t chunk_type;
unsigned int chunk_size; uint32_t chunk_size;
int skip_byte; int skip_byte;
while (avio_read(pb, preamble, VQA_PREAMBLE_SIZE) == VQA_PREAMBLE_SIZE) { while (avio_read(pb, preamble, VQA_PREAMBLE_SIZE) == VQA_PREAMBLE_SIZE) {