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

simplify

Browse Source 
Originally committed as revision 7457 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2007-01-14 01:20:24 +00:00
parent 5b1e5dce35
commit 655254f001
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/swf.c
View File

@ -855,17 +855,17 @@ static int swf_read_packet(AVFormatContext *s, AVPacket *pkt)
return AVERROR_IO; return AVERROR_IO;
if (tag == TAG_VIDEOFRAME) { if (tag == TAG_VIDEOFRAME) {
int ch_id = get_le16(pb); int ch_id = get_le16(pb);
len -= 2;
for( i=0; i<s->nb_streams; i++ ) { for( i=0; i<s->nb_streams; i++ ) {
st = s->streams[i]; st = s->streams[i];
if (st->codec->codec_type == CODEC_TYPE_VIDEO && st->id == ch_id) { if (st->codec->codec_type == CODEC_TYPE_VIDEO && st->id == ch_id) {
frame = get_le16(pb); frame = get_le16(pb);
av_get_packet(pb, pkt, len-4); av_get_packet(pb, pkt, len-2);
pkt->pts = frame * swf->ms_per_frame; pkt->pts = frame * swf->ms_per_frame;
pkt->stream_index = st->index; pkt->stream_index = st->index;
return pkt->size; return pkt->size;
} }
} }
url_fskip(pb, len-2);
} else if (tag == TAG_STREAMBLOCK) { } else if (tag == TAG_STREAMBLOCK) {
st = s->streams[swf->audio_stream_index]; st = s->streams[swf->audio_stream_index];
if (st->codec->codec_id == CODEC_ID_MP3) { if (st->codec->codec_id == CODEC_ID_MP3) {
@ -874,10 +874,8 @@ static int swf_read_packet(AVFormatContext *s, AVPacket *pkt)
pkt->stream_index = st->index; pkt->stream_index = st->index;
return pkt->size; return pkt->size;
} }
url_fskip(pb, len);
} else {
url_fskip(pb, len);
} }
url_fskip(pb, len);
} }
return 0; return 0;
} }