opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-01 21:48:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

simplify size handling code

Browse Source 
Originally committed as revision 15040 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier
2008-08-29 22:03:18 +00:00
parent 53440c621b
commit 6298eb810d
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/flvdec.c
View File

@ -322,11 +322,13 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt)
if (type == FLV_TAG_TYPE_AUDIO) { if (type == FLV_TAG_TYPE_AUDIO) {
is_audio=1; is_audio=1;
flags = get_byte(s->pb); flags = get_byte(s->pb);
size--;
} else if (type == FLV_TAG_TYPE_VIDEO) { } else if (type == FLV_TAG_TYPE_VIDEO) {
is_audio=0; is_audio=0;
flags = get_byte(s->pb); flags = get_byte(s->pb);
size--;
if ((flags & 0xf0) == 0x50) { /* video info / command frame */ if ((flags & 0xf0) == 0x50) { /* video info / command frame */
url_fskip(s->pb, size - 1); url_fskip(s->pb, size);
continue; continue;
} }
} else { } else {
@ -400,13 +402,13 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt)
get_be24(s->pb); get_be24(s->pb);
} }
if (type == 0) { if (type == 0) {
if ((ret = flv_get_extradata(s, st, size - 1)) < 0) if ((ret = flv_get_extradata(s, st, size)) < 0)
return ret; return ret;
goto retry; goto retry;
} }
} }
ret= av_get_packet(s->pb, pkt, size - 1); ret= av_get_packet(s->pb, pkt, size);
if (ret <= 0) { if (ret <= 0) {
return AVERROR(EIO); return AVERROR(EIO);
} }