generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'ad94c6ca0b86c463f476b26606259a2041dcddc9'

Browse Source 
* commit 'ad94c6ca0b86c463f476b26606259a2041dcddc9':
  siff: Use the correct type for packet size variables

Conflicts:
	libavformat/siff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-03-09 21:00:33 +01:00
commit 8f92c0898d
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavformat/siff.c
View File

@ -54,11 +54,11 @@ typedef struct SIFFContext {
int has_audio; int has_audio;
int curstrm; int curstrm;
int pktsize; unsigned int pktsize;
int gmcsize; int gmcsize;
int sndsize; int sndsize;
int flags; unsigned int flags;
uint8_t gmc[4]; uint8_t gmc[4];
} SIFFContext; } SIFFContext;
@ -192,9 +192,9 @@ static int siff_read_header(AVFormatContext *s)
static int siff_read_packet(AVFormatContext *s, AVPacket *pkt) static int siff_read_packet(AVFormatContext *s, AVPacket *pkt)
{ {
SIFFContext *c = s->priv_data; SIFFContext *c = s->priv_data;
int size;
if (c->has_video) { if (c->has_video) {
unsigned int size;
if (c->cur_frame >= c->frames) if (c->cur_frame >= c->frames)
return AVERROR_EOF; return AVERROR_EOF;
if (c->curstrm == -1) { if (c->curstrm == -1) {
@ -224,10 +224,11 @@ static int siff_read_packet(AVFormatContext *s, AVPacket *pkt)
pkt->stream_index = 0; pkt->stream_index = 0;
c->curstrm = -1; c->curstrm = -1;
} else { } else {
if ((size = av_get_packet(s->pb, pkt, c->sndsize - 4)) < 0) int pktsize = av_get_packet(s->pb, pkt, c->sndsize - 4);
if (pktsize < 0)
return AVERROR(EIO); return AVERROR(EIO);
pkt->stream_index = 1; pkt->stream_index = 1;
pkt->duration = size; pkt->duration = pktsize;
c->curstrm = 0; c->curstrm = 0;
} }
if (!c->cur_frame || c->curstrm) if (!c->cur_frame || c->curstrm)
@ -235,12 +236,12 @@ static int siff_read_packet(AVFormatContext *s, AVPacket *pkt)
if (c->curstrm == -1) if (c->curstrm == -1)
c->cur_frame++; c->cur_frame++;
} else { } else {
size = av_get_packet(s->pb, pkt, c->block_align); int pktsize = av_get_packet(s->pb, pkt, c->block_align);
if (!size) if (!pktsize)
return AVERROR_EOF; return AVERROR_EOF;
if (size < 0) if (pktsize <= 0)
return AVERROR(EIO); return AVERROR(EIO);
pkt->duration = size; pkt->duration = pktsize;
} }
return pkt->size; return pkt->size;
} }