virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

simplify and use version instead

Browse Source 
Originally committed as revision 13459 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2008-05-27 03:11:31 +00:00
parent 6ef445fede
commit 4a712c3378
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/swfenc.c
View File

@ -178,7 +178,7 @@ static int swf_write_header(AVFormatContext *s)
PutBitContext p; PutBitContext p;
uint8_t buf1[256]; uint8_t buf1[256];
int i, width, height, rate, rate_base; int i, width, height, rate, rate_base;
int is_avm2; int version;
swf->audio_in_pos = 0; swf->audio_in_pos = 0;
swf->sound_samples = 0; swf->sound_samples = 0;
@ -235,17 +235,18 @@ static int swf_write_header(AVFormatContext *s)
swf->samples_per_frame = (audio_enc->sample_rate * rate_base) / rate; swf->samples_per_frame = (audio_enc->sample_rate * rate_base) / rate;
} }
is_avm2 = !strcmp("avm2", s->oformat->name);
put_tag(pb, "FWS"); put_tag(pb, "FWS");
if (is_avm2)
put_byte(pb, 9); if (!strcmp("avm2", s->oformat->name))
version = 9;
else if (video_enc && video_enc->codec_id == CODEC_ID_VP6F) else if (video_enc && video_enc->codec_id == CODEC_ID_VP6F)
put_byte(pb, 8); /* version (version 8 and above support VP6 codec) */ version = 8; /* version 8 and above support VP6 codec */
else if (video_enc && video_enc->codec_id == CODEC_ID_FLV1) else if (video_enc && video_enc->codec_id == CODEC_ID_FLV1)
put_byte(pb, 6); /* version (version 6 and above support FLV1 codec) */ version = 6; /* version 6 and above support FLV1 codec */
else else
put_byte(pb, 4); /* version (should use 4 for mpeg audio support) */ version = 4; /* version 4 for mpeg audio support */
put_byte(pb, version);
put_le32(pb, DUMMY_FILE_SIZE); /* dummy size put_le32(pb, DUMMY_FILE_SIZE); /* dummy size
(will be patched if not streamed) */ (will be patched if not streamed) */
@ -255,7 +256,7 @@ static int swf_write_header(AVFormatContext *s)
put_le16(pb, (uint16_t)(DUMMY_DURATION * (int64_t)rate / rate_base)); /* frame count */ put_le16(pb, (uint16_t)(DUMMY_DURATION * (int64_t)rate / rate_base)); /* frame count */
/* avm2/swf v9 (also v8?) files require a file attribute tag */ /* avm2/swf v9 (also v8?) files require a file attribute tag */
if (is_avm2) { if (version == 9) {
put_swf_tag(s, TAG_FILEATTRIBUTES); put_swf_tag(s, TAG_FILEATTRIBUTES);
put_le32(pb, 1<<3); /* set ActionScript v3/AVM2 flag */ put_le32(pb, 1<<3); /* set ActionScript v3/AVM2 flag */
put_swf_end_tag(s); put_swf_end_tag(s);