Mercurial > libavformat.hg
comparison asf-enc.c @ 1677:2a85c82b8538 libavformat
add codec_id <-> codec_tag tables to AVIn/OutputFormat
author | michael |
---|---|
date | Sun, 21 Jan 2007 01:39:17 +0000 |
parents | ac2a299df031 |
children | ba58d49d4685 |
comparison
equal
deleted
inserted
replaced
1676:507177b7444c | 1677:2a85c82b8538 |
---|---|
185 PACKET_HEADER_MIN_SIZE - \ | 185 PACKET_HEADER_MIN_SIZE - \ |
186 1 - /*Payload Flags*/ \ | 186 1 - /*Payload Flags*/ \ |
187 2*PAYLOAD_HEADER_SIZE_MULTIPLE_PAYLOADS \ | 187 2*PAYLOAD_HEADER_SIZE_MULTIPLE_PAYLOADS \ |
188 ) | 188 ) |
189 | 189 |
190 static const AVCodecTag codec_asf_bmp_tags[] = { | |
191 { CODEC_ID_MPEG4, MKTAG('M', 'P', '4', 'S') }, | |
192 { CODEC_ID_MPEG4, MKTAG('M', '4', 'S', '2') }, | |
193 { CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', '4', '3') }, | |
194 { CODEC_ID_NONE, 0 }, | |
195 }; | |
196 | |
190 static int preroll_time = 2000; | 197 static int preroll_time = 2000; |
191 | 198 |
192 static const uint8_t error_spread_ADPCM_G726[] = { 0x01, 0x90, 0x01, 0x90, 0x01, 0x01, 0x00, 0x00 }; | 199 static const uint8_t error_spread_ADPCM_G726[] = { 0x01, 0x90, 0x01, 0x90, 0x01, 0x01, 0x00, 0x00 }; |
193 | 200 |
194 static void put_guid(ByteIOContext *s, const GUID *g) | 201 static void put_guid(ByteIOContext *s, const GUID *g) |
840 CODEC_ID_MSMPEG4V3, | 847 CODEC_ID_MSMPEG4V3, |
841 asf_write_header, | 848 asf_write_header, |
842 asf_write_packet, | 849 asf_write_packet, |
843 asf_write_trailer, | 850 asf_write_trailer, |
844 .flags = AVFMT_GLOBALHEADER, | 851 .flags = AVFMT_GLOBALHEADER, |
852 .codec_tag= {codec_asf_bmp_tags, codec_bmp_tags, codec_wav_tags}, | |
845 }; | 853 }; |
846 #endif | 854 #endif |
847 | 855 |
848 #ifdef CONFIG_ASF_STREAM_MUXER | 856 #ifdef CONFIG_ASF_STREAM_MUXER |
849 AVOutputFormat asf_stream_muxer = { | 857 AVOutputFormat asf_stream_muxer = { |
860 CODEC_ID_MSMPEG4V3, | 868 CODEC_ID_MSMPEG4V3, |
861 asf_write_stream_header, | 869 asf_write_stream_header, |
862 asf_write_packet, | 870 asf_write_packet, |
863 asf_write_trailer, | 871 asf_write_trailer, |
864 .flags = AVFMT_GLOBALHEADER, | 872 .flags = AVFMT_GLOBALHEADER, |
873 .codec_tag= {codec_asf_bmp_tags, codec_bmp_tags, codec_wav_tags}, | |
865 }; | 874 }; |
866 #endif //CONFIG_ASF_STREAM_MUXER | 875 #endif //CONFIG_ASF_STREAM_MUXER |