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

always export audiostreams 

Originally committed as revision 7454 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2007-01-14 00:54:03 +00:00
parent 69566e4365
commit ec54839ab1
1 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavformat/swf.c
View File

@ -811,17 +811,13 @@ static int swf_read_header(AVFormatContext *s, AVFormatParameters *ap)
get_byte(pb); get_byte(pb);
v = get_byte(pb); v = get_byte(pb);
swf->samples_per_frame = get_le16(pb); swf->samples_per_frame = get_le16(pb);
if (len > 4)
url_fskip(pb,len-4);
/* if mp3 streaming found, OK */
if ((v & 0x20) != 0) {
ast = av_new_stream(s, 1); ast = av_new_stream(s, 1);
if (!ast)
return -ENOMEM;
av_set_pts_info(ast, 24, 1, 1000); /* 24 bit pts in ms */ av_set_pts_info(ast, 24, 1, 1000); /* 24 bit pts in ms */
ast->codec->channels = 1 + (v&1); ast->codec->channels = 1 + (v&1);
ast->codec->codec_type = CODEC_TYPE_AUDIO;
if (v & 0x20)
ast->codec->codec_id = CODEC_ID_MP3;
ast->need_parsing = 1;
switch((v>> 2) & 0x03) { switch((v>> 2) & 0x03) {
case 1: case 1:
ast->codec->sample_rate = 11025; ast->codec->sample_rate = 11025;
@ -833,13 +829,12 @@ static int swf_read_header(AVFormatContext *s, AVFormatParameters *ap)
ast->codec->sample_rate = 44100; ast->codec->sample_rate = 44100;
break; break;
default: default:
av_free(ast);
return AVERROR_IO; return AVERROR_IO;
} }
ast->codec->codec_type = CODEC_TYPE_AUDIO;
ast->codec->codec_id = CODEC_ID_MP3; if (len > 4)
ast->need_parsing = 1; url_fskip(pb,len-4);
}
} else { } else {
url_fskip(pb, len); url_fskip(pb, len);
} }