diff options
| author | Måns Rullgård <mans@mansr.com> | 2006-07-10 21:14:37 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2006-07-10 21:14:37 +0000 |
| commit | ff70e60176056daf646109b8e42654a3036fa02b (patch) | |
| tree | 42e32d1e4bff334964cf93766ff2da6ee9a8f1d3 /libavformat/avienc.c | |
| parent | 4cac0d5589ab1a076e977425925015f2c8e591a8 (diff) | |
allow individual selection of muxers and demuxers
Originally committed as revision 5707 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/avienc.c')
| -rw-r--r-- | libavformat/avienc.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/libavformat/avienc.c b/libavformat/avienc.c index c9b6c08d30..1447e80063 100644 --- a/libavformat/avienc.c +++ b/libavformat/avienc.c @@ -24,7 +24,7 @@ * - fill all fields if non streamed (nb_frames for example) */ -#ifdef CONFIG_MUXERS +#ifdef CONFIG_AVI_MUXER typedef struct AVIIentry { unsigned int flags, pos, len; } AVIIentry; @@ -71,7 +71,7 @@ void end_tag(ByteIOContext *pb, offset_t start) put_le32(pb, (uint32_t)(pos - start)); url_fseek(pb, pos, SEEK_SET); } -#endif //CONFIG_MUXERS +#endif //CONFIG_AVI_MUXER /* Note: when encoding, the first matching tag is used, so order is important if multiple tags possible for a given codec. */ @@ -260,7 +260,7 @@ enum CodecID codec_get_wav_id(unsigned int tag) return codec_get_id(codec_wav_tags, tag); } -#ifdef CONFIG_MUXERS +#ifdef CONFIG_AVI_MUXER /* BITMAPINFOHEADER header */ void put_bmp_header(ByteIOContext *pb, AVCodecContext *enc, const CodecTag *tags, int for_asf) { @@ -762,7 +762,7 @@ static int avi_write_trailer(AVFormatContext *s) return res; } -static AVOutputFormat avi_muxer = { +AVOutputFormat avi_muxer = { "avi", "avi format", "video/x-msvideo", @@ -774,10 +774,4 @@ static AVOutputFormat avi_muxer = { avi_write_packet, avi_write_trailer, }; - -int avienc_init(void) -{ - av_register_output_format(&avi_muxer); - return 0; -} -#endif //CONFIG_MUXERS +#endif //CONFIG_AVI_MUXER |