diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2007-01-21 01:39:17 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2007-01-21 01:39:17 +0000 |
| commit | 7caf0cc62cad8a5548c3e7e0b35ead00584100c8 (patch) | |
| tree | e1562ae2a42534630673125d7f7712da466f43be /libavformat/asf-enc.c | |
| parent | 5c4e1928c0e79438be23cbec9ce579d790bb985a (diff) | |
| download | ffmpeg-7caf0cc62cad8a5548c3e7e0b35ead00584100c8.tar.gz | |
add codec_id <-> codec_tag tables to AVIn/OutputFormat
Originally committed as revision 7593 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/asf-enc.c')
| -rw-r--r-- | libavformat/asf-enc.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libavformat/asf-enc.c b/libavformat/asf-enc.c index f72fef97a1..62312bd034 100644 --- a/libavformat/asf-enc.c +++ b/libavformat/asf-enc.c @@ -187,6 +187,13 @@ 2*PAYLOAD_HEADER_SIZE_MULTIPLE_PAYLOADS \ ) +static const AVCodecTag codec_asf_bmp_tags[] = { + { CODEC_ID_MPEG4, MKTAG('M', 'P', '4', 'S') }, + { CODEC_ID_MPEG4, MKTAG('M', '4', 'S', '2') }, + { CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', '4', '3') }, + { CODEC_ID_NONE, 0 }, +}; + static int preroll_time = 2000; static const uint8_t error_spread_ADPCM_G726[] = { 0x01, 0x90, 0x01, 0x90, 0x01, 0x01, 0x00, 0x00 }; @@ -842,6 +849,7 @@ AVOutputFormat asf_muxer = { asf_write_packet, asf_write_trailer, .flags = AVFMT_GLOBALHEADER, + .codec_tag= {codec_asf_bmp_tags, codec_bmp_tags, codec_wav_tags}, }; #endif @@ -862,5 +870,6 @@ AVOutputFormat asf_stream_muxer = { asf_write_packet, asf_write_trailer, .flags = AVFMT_GLOBALHEADER, + .codec_tag= {codec_asf_bmp_tags, codec_bmp_tags, codec_wav_tags}, }; #endif //CONFIG_ASF_STREAM_MUXER |