always export videostreams

Originally committed as revision 7452 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2007-01-14 00:46:37 +00:00
parent 6ac558eefc
commit b4bcf81001
1 changed files with 7 additions and 12 deletions

View File

@ -792,24 +792,19 @@ static int swf_read_header(AVFormatContext *s, AVFormatParameters *ap)
return AVERROR_IO; return AVERROR_IO;
} }
if ( tag == TAG_VIDEOSTREAM && !vst) { if ( tag == TAG_VIDEOSTREAM && !vst) {
int codec_id;
swf->ch_id = get_le16(pb); swf->ch_id = get_le16(pb);
get_le16(pb); get_le16(pb);
get_le16(pb); get_le16(pb);
get_le16(pb); get_le16(pb);
get_byte(pb); get_byte(pb);
/* Check for FLV1 */ /* Check for FLV1 */
codec_id = codec_get_id(swf_codec_tags, get_byte(pb)); vst = av_new_stream(s, 0);
if ( codec_id ) { av_set_pts_info(vst, 24, 1, 1000); /* 24 bit pts in ms */
vst = av_new_stream(s, 0); vst->codec->codec_type = CODEC_TYPE_VIDEO;
av_set_pts_info(vst, 24, 1, 1000); /* 24 bit pts in ms */ vst->codec->codec_id = codec_get_id(swf_codec_tags, get_byte(pb));
if (swf->samples_per_frame) {
vst->codec->codec_type = CODEC_TYPE_VIDEO; vst->codec->time_base.den = 1000. / swf->ms_per_frame;
vst->codec->codec_id = codec_id; vst->codec->time_base.num = 1;
if ( swf->samples_per_frame ) {
vst->codec->time_base.den = 1000. / swf->ms_per_frame;
vst->codec->time_base.num = 1;
}
} }
} else if ( ( tag == TAG_STREAMHEAD || tag == TAG_STREAMHEAD2 ) && !ast) { } else if ( ( tag == TAG_STREAMHEAD || tag == TAG_STREAMHEAD2 ) && !ast) {
/* streaming found */ /* streaming found */