From a9e350952992f07f4b560385185f406fbbb752d7 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Fri, 23 Sep 2005 00:25:41 +0000 Subject: [PATCH] Replace CONFIG_ENCODERS/CONFIG_DECODERS with CONFIG_MUXERS/CONFIG_DEMUXERS in libavformat to allow building (de)coders and (de)muxers independently at some point + support for this option in configure. Originally committed as revision 4611 to svn://svn.ffmpeg.org/ffmpeg/trunk --- configure | 20 ++++++++++++++++ libavformat/allformats.c | 24 +++++++++---------- libavformat/asf-enc.c | 4 ++-- libavformat/asf.c | 8 +++---- libavformat/au.c | 12 +++++----- libavformat/avienc.c | 8 +++---- libavformat/avio.c | 4 ++-- libavformat/aviobuf.c | 24 +++++++++---------- libavformat/ffm.c | 12 +++++----- libavformat/jpeg.c | 8 +++---- libavformat/mmf.c | 12 +++++----- libavformat/mp3.c | 12 +++++----- libavformat/mpeg.c | 12 +++++----- libavformat/mpegts.c | 2 +- libavformat/mpjpeg.c | 4 ++-- libavformat/nut.c | 12 +++++----- libavformat/ogg.c | 6 ++--- libavformat/ogg2.c | 6 ++--- libavformat/raw.c | 52 ++++++++++++++++++++-------------------- libavformat/rm.c | 12 +++++----- libavformat/sgi.c | 8 +++---- libavformat/swf.c | 12 +++++----- libavformat/wav.c | 16 ++++++------- libavformat/yuv4mpeg.c | 8 +++---- 24 files changed, 159 insertions(+), 139 deletions(-) diff --git a/configure b/configure index 76b642a950..7ba146548e 100755 --- a/configure +++ b/configure @@ -78,6 +78,8 @@ echo " --enable-codec=codec enables codec" echo " --disable-codec=codec disables codec" echo " --disable-encoders disables all encoders" echo " --disable-decoders disables all decoders" +echo " --disable-muxers disables all muxers" +echo " --disable-demuxers disables all demuxers" echo "" echo "NOTE: The object files are build at the place where configure is launched" exit 1 @@ -218,6 +220,8 @@ sunmlib="no" pthreads="no" gpl="no" memalignhack="no" +muxers="yes" +demuxers="yes" # OS specific targetos=`uname -s` @@ -533,6 +537,10 @@ for opt do ;; --disable-decoders) CODEC_LIST="`echo $CODEC_LIST | sed 's/[-_a-zA-Z0-9]*decoder//g'`" ;; + --disable-muxers) muxers="no" + ;; + --disable-demuxers) demuxers="no" + ;; esac done @@ -1399,6 +1407,18 @@ echo "CONFIG_ENCODERS=yes" >> config.mak echo "#define CONFIG_DECODERS 1" >> $TMPH echo "CONFIG_DECODERS=yes" >> config.mak +# muxers +if test "$muxers" = "yes" ; then + echo "#define CONFIG_MUXERS 1" >> $TMPH + echo "CONFIG_MUXERS=yes" >> config.mak +fi + +# demuxers +if test "$demuxers" = "yes" ; then + echo "#define CONFIG_DEMUXERS 1" >> $TMPH + echo "CONFIG_DEMUXERS=yes" >> config.mak +fi + # AC3 if test "$a52" = "yes" ; then echo "#define CONFIG_AC3 1" >> $TMPH diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 5e8692167b..6603a43d4d 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -37,36 +37,36 @@ void av_register_all(void) mpegps_init(); mpegts_init(); -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS crc_init(); img_init(); img2_init(); -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS raw_init(); mp3_init(); rm_init(); asf_init(); -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS avienc_init(); -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS avidec_init(); ff_wav_init(); ff_mmf_init(); swf_init(); au_init(); -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS gif_init(); -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS mov_init(); -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS movenc_init(); jpeg_init(); -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS ff_dv_init(); fourxm_init(); -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS flvenc_init(); -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS flvdec_init(); str_init(); roq_init(); @@ -111,7 +111,7 @@ void av_register_all(void) nsvdec_init(); daud_init(); -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS /* image formats */ #if 0 av_register_image_format(&pnm_image_format); @@ -128,7 +128,7 @@ void av_register_all(void) #endif av_register_image_format(&gif_image_format); // av_register_image_format(&sgi_image_format); heap corruption, dont enable -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS /* file protocols */ register_protocol(&file_protocol); diff --git a/libavformat/asf-enc.c b/libavformat/asf-enc.c index a6b3f032e1..adbf89c88e 100644 --- a/libavformat/asf-enc.c +++ b/libavformat/asf-enc.c @@ -23,7 +23,7 @@ #undef NDEBUG #include -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS #define ASF_INDEXED_INTERVAL 10000000 @@ -858,4 +858,4 @@ AVOutputFormat asf_stream_oformat = { asf_write_trailer, .flags = AVFMT_GLOBALHEADER, }; -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS diff --git a/libavformat/asf.c b/libavformat/asf.c index 435d8256d8..63a255ea90 100644 --- a/libavformat/asf.c +++ b/libavformat/asf.c @@ -792,17 +792,17 @@ static AVInputFormat asf_iformat = { asf_read_pts, }; -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS extern AVOutputFormat asf_oformat; extern AVOutputFormat asf_stream_oformat; -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS int asf_init(void) { av_register_input_format(&asf_iformat); -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS av_register_output_format(&asf_oformat); av_register_output_format(&asf_stream_oformat); -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS return 0; } diff --git a/libavformat/au.c b/libavformat/au.c index 1777747a92..055c59a22b 100644 --- a/libavformat/au.c +++ b/libavformat/au.c @@ -39,7 +39,7 @@ static const CodecTag codec_au_tags[] = { { 0, 0 }, }; -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS /* AUDIO_FILE header */ static int put_au_header(ByteIOContext *pb, AVCodecContext *enc) { @@ -97,7 +97,7 @@ static int au_write_trailer(AVFormatContext *s) return 0; } -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS static int au_probe(AVProbeData *p) { @@ -188,7 +188,7 @@ static AVInputFormat au_iformat = { pcm_read_seek, }; -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS static AVOutputFormat au_oformat = { "au", "SUN AU Format", @@ -201,13 +201,13 @@ static AVOutputFormat au_oformat = { au_write_packet, au_write_trailer, }; -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS int au_init(void) { av_register_input_format(&au_iformat); -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS av_register_output_format(&au_oformat); -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS return 0; } diff --git a/libavformat/avienc.c b/libavformat/avienc.c index 537f6d1a8f..2fdead9dec 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_ENCODERS +#ifdef CONFIG_MUXERS 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_ENCODERS +#endif //CONFIG_MUXERS /* Note: when encoding, the first matching tag is used, so order is important if multiple tags possible for a given codec. */ @@ -245,7 +245,7 @@ enum CodecID codec_get_wav_id(unsigned int tag) return codec_get_id(codec_wav_tags, tag); } -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS /* BITMAPINFOHEADER header */ void put_bmp_header(ByteIOContext *pb, AVCodecContext *enc, const CodecTag *tags, int for_asf) { @@ -752,4 +752,4 @@ int avienc_init(void) av_register_output_format(&avi_oformat); return 0; } -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS diff --git a/libavformat/avio.c b/libavformat/avio.c index f4cee60668..3f5efd62ce 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -100,7 +100,7 @@ int url_read(URLContext *h, unsigned char *buf, int size) return ret; } -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS int url_write(URLContext *h, unsigned char *buf, int size) { int ret; @@ -112,7 +112,7 @@ int url_write(URLContext *h, unsigned char *buf, int size) ret = h->prot->url_write(h, buf, size); return ret; } -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS offset_t url_seek(URLContext *h, offset_t pos, int whence) { diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index f6f65c1e13..cead878f02 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -54,7 +54,7 @@ int init_put_byte(ByteIOContext *s, } -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS static void flush_buffer(ByteIOContext *s) { if (s->buf_ptr > s->buffer) { @@ -104,7 +104,7 @@ void put_flush_packet(ByteIOContext *s) flush_buffer(s); s->must_flush = 0; } -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS offset_t url_fseek(ByteIOContext *s, offset_t offset, int whence) { @@ -113,7 +113,7 @@ offset_t url_fseek(ByteIOContext *s, offset_t offset, int whence) if (whence != SEEK_CUR && whence != SEEK_SET) return -EINVAL; -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS if (s->write_flag) { if (whence == SEEK_CUR) { offset1 = s->pos + (s->buf_ptr - s->buffer); @@ -136,7 +136,7 @@ offset_t url_fseek(ByteIOContext *s, offset_t offset, int whence) s->pos = offset; } } else -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS { if (whence == SEEK_CUR) { offset1 = s->pos - (s->buf_end - s->buffer) + (s->buf_ptr - s->buffer); @@ -193,7 +193,7 @@ int url_ferror(ByteIOContext *s) return s->error; } -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS void put_le32(ByteIOContext *s, unsigned int val) { put_byte(s, val); @@ -254,7 +254,7 @@ void put_tag(ByteIOContext *s, const char *tag) put_byte(s, *tag++); } } -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS /* Input stream */ @@ -463,7 +463,7 @@ uint64_t get_be64(ByteIOContext *s) /* link with avio functions */ -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS static int url_write_packet(void *opaque, uint8_t *buf, int buf_size) { URLContext *h = opaque; @@ -471,7 +471,7 @@ static int url_write_packet(void *opaque, uint8_t *buf, int buf_size) } #else #define url_write_packet NULL -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS static int url_read_packet(void *opaque, uint8_t *buf, int buf_size) { @@ -564,7 +564,7 @@ URLContext *url_fileno(ByteIOContext *s) return s->opaque; } -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS /* XXX: currently size is limited */ int url_fprintf(ByteIOContext *s, const char *fmt, ...) { @@ -578,7 +578,7 @@ int url_fprintf(ByteIOContext *s, const char *fmt, ...) put_buffer(s, buf, strlen(buf)); return ret; } -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS /* note: unlike fgets, the EOL character is not returned and a whole line is parsed. return NULL if first char read was EOF */ @@ -616,7 +616,7 @@ int url_fget_max_packet_size(ByteIOContext *s) return s->max_packet_size; } -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS /* buffer handling */ int url_open_buf(ByteIOContext *s, uint8_t *buf, int buf_size, int flags) { @@ -779,4 +779,4 @@ int url_close_dyn_buf(ByteIOContext *s, uint8_t **pbuffer) av_free(d); return size; } -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS diff --git a/libavformat/ffm.c b/libavformat/ffm.c index 99e7e89b4e..730ba02398 100644 --- a/libavformat/ffm.c +++ b/libavformat/ffm.c @@ -56,7 +56,7 @@ static int64_t get_pts(AVFormatContext *s, offset_t pos); /* disable pts hack for testing */ int ffm_nopts = 0; -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS static void flush_packet(AVFormatContext *s) { FFMContext *ffm = s->priv_data; @@ -294,7 +294,7 @@ static int ffm_write_trailer(AVFormatContext *s) return 0; } -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS /* ffm demux */ @@ -763,7 +763,7 @@ static AVInputFormat ffm_iformat = { ffm_seek, }; -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS static AVOutputFormat ffm_oformat = { "ffm", "ffm format", @@ -777,13 +777,13 @@ static AVOutputFormat ffm_oformat = { ffm_write_packet, ffm_write_trailer, }; -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS int ffm_init(void) { av_register_input_format(&ffm_iformat); -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS av_register_output_format(&ffm_oformat); -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS return 0; } diff --git a/libavformat/jpeg.c b/libavformat/jpeg.c index d922d6c73a..bf640d87a6 100644 --- a/libavformat/jpeg.c +++ b/libavformat/jpeg.c @@ -160,7 +160,7 @@ static int jpeg_read(ByteIOContext *f, return jctx.ret_code; } -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS static int jpeg_write(ByteIOContext *pb, AVImageInfo *info) { AVCodecContext *c; @@ -222,7 +222,7 @@ static int jpeg_write(ByteIOContext *pb, AVImageInfo *info) av_free(c); return ret; } -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS AVImageFormat jpeg_image_format = { "jpeg", @@ -230,9 +230,9 @@ AVImageFormat jpeg_image_format = { jpeg_probe, jpeg_read, (1 << PIX_FMT_YUVJ420P) | (1 << PIX_FMT_YUVJ422P) | (1 << PIX_FMT_YUVJ444P), -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS jpeg_write, #else NULL, -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS }; diff --git a/libavformat/mmf.c b/libavformat/mmf.c index 177f2df3fc..5cdaefa973 100644 --- a/libavformat/mmf.c +++ b/libavformat/mmf.c @@ -24,7 +24,7 @@ typedef struct { offset_t data_size; } MMFContext; -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS static int mmf_rates[] = { 4000, 8000, 11025, 22050, 44100 }; static int mmf_rate_code(int rate) @@ -160,7 +160,7 @@ static int mmf_write_trailer(AVFormatContext *s) } return 0; } -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS static int mmf_probe(AVProbeData *p) { @@ -308,7 +308,7 @@ static AVInputFormat mmf_iformat = { mmf_read_seek, }; -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS static AVOutputFormat mmf_oformat = { "mmf", "mmf format", @@ -321,14 +321,14 @@ static AVOutputFormat mmf_oformat = { mmf_write_packet, mmf_write_trailer, }; -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS int ff_mmf_init(void) { av_register_input_format(&mmf_iformat); -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS av_register_output_format(&mmf_oformat); -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS return 0; } diff --git a/libavformat/mp3.c b/libavformat/mp3.c index f45f852d58..8eb98fcb38 100644 --- a/libavformat/mp3.c +++ b/libavformat/mp3.c @@ -314,7 +314,7 @@ static int mp3_read_close(AVFormatContext *s) return 0; } -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS /* simple formats */ static int mp3_write_header(struct AVFormatContext *s) { @@ -340,7 +340,7 @@ static int mp3_write_trailer(struct AVFormatContext *s) } return 0; } -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS AVInputFormat mp3_iformat = { "mp3", @@ -353,7 +353,7 @@ AVInputFormat mp3_iformat = { .extensions = "mp2,mp3,m2a", /* XXX: use probe */ }; -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS AVOutputFormat mp2_oformat = { "mp2", "MPEG audio layer 2", @@ -385,16 +385,16 @@ AVOutputFormat mp3_oformat = { mp3_write_trailer, }; #endif -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS int mp3_init(void) { av_register_input_format(&mp3_iformat); -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS av_register_output_format(&mp2_oformat); #ifdef CONFIG_MP3LAME av_register_output_format(&mp3_oformat); #endif -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS return 0; } diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index a597495ef4..1e4d2a79f1 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -107,7 +107,7 @@ typedef struct { static const int lpcm_freq_tab[4] = { 48000, 96000, 44100, 32000 }; -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS static AVOutputFormat mpeg1system_mux; static AVOutputFormat mpeg1vcd_mux; static AVOutputFormat mpeg2vob_mux; @@ -1253,7 +1253,7 @@ static int mpeg_mux_end(AVFormatContext *ctx) } return 0; } -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS /*********************************************/ /* demux code */ @@ -1707,7 +1707,7 @@ static int64_t mpegps_read_dts(AVFormatContext *s, int stream_index, return dts; } -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS static AVOutputFormat mpeg1system_mux = { "mpeg", "MPEG1 System format", @@ -1775,7 +1775,7 @@ static AVOutputFormat mpeg2dvd_mux = { mpeg_mux_end, }; -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS AVInputFormat mpegps_demux = { "mpeg", @@ -1792,13 +1792,13 @@ AVInputFormat mpegps_demux = { int mpegps_init(void) { -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS av_register_output_format(&mpeg1system_mux); av_register_output_format(&mpeg1vcd_mux); av_register_output_format(&mpeg2vob_mux); av_register_output_format(&mpeg2svcd_mux); av_register_output_format(&mpeg2dvd_mux); -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS av_register_input_format(&mpegps_demux); return 0; } diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index e879da90b4..83c6002c1f 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -1498,7 +1498,7 @@ AVInputFormat mpegts_demux = { int mpegts_init(void) { av_register_input_format(&mpegts_demux); -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS av_register_output_format(&mpegts_mux); #endif return 0; diff --git a/libavformat/mpjpeg.c b/libavformat/mpjpeg.c index db854bac5d..42efc0a1a0 100644 --- a/libavformat/mpjpeg.c +++ b/libavformat/mpjpeg.c @@ -22,7 +22,7 @@ #define BOUNDARY_TAG "ffserver" -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS static int mpjpeg_write_header(AVFormatContext *s) { uint8_t buf1[256]; @@ -70,4 +70,4 @@ int jpeg_init(void) av_register_output_format(&mpjpeg_format); return 0; } -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS diff --git a/libavformat/nut.c b/libavformat/nut.c index 2d63cc7ba7..b33e4ca52b 100644 --- a/libavformat/nut.c +++ b/libavformat/nut.c @@ -394,7 +394,7 @@ static int64_t find_startcode(ByteIOContext *bc, uint64_t code, int64_t pos){ } } -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS static void put_v(ByteIOContext *bc, uint64_t val) { @@ -843,7 +843,7 @@ static int nut_write_trailer(AVFormatContext *s) return 0; } -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS static int nut_probe(AVProbeData *p) { @@ -1430,7 +1430,7 @@ static AVInputFormat nut_iformat = { .extensions = "nut", }; -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS static AVOutputFormat nut_oformat = { "nut", "nut format", @@ -1450,13 +1450,13 @@ static AVOutputFormat nut_oformat = { nut_write_trailer, .flags = AVFMT_GLOBALHEADER, }; -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS int nut_init(void) { av_register_input_format(&nut_iformat); -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS av_register_output_format(&nut_oformat); -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS return 0; } diff --git a/libavformat/ogg.c b/libavformat/ogg.c index 58f7c505f6..41fa0d92e0 100644 --- a/libavformat/ogg.c +++ b/libavformat/ogg.c @@ -29,7 +29,7 @@ typedef struct OggContext { } OggContext ; -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS static int ogg_write_header(AVFormatContext *avfcontext) { OggContext *context = avfcontext->priv_data; @@ -149,7 +149,7 @@ static AVOutputFormat ogg_oformat = { ogg_write_packet, ogg_write_trailer, } ; -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS #if 0 static int next_packet(AVFormatContext *avfcontext, ogg_packet *op) { @@ -267,7 +267,7 @@ static AVInputFormat ogg_iformat = { #endif int libogg_init(void) { -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS av_register_output_format(&ogg_oformat) ; #endif /* av_register_input_format(&ogg_iformat); */ diff --git a/libavformat/ogg2.c b/libavformat/ogg2.c index b32e27d3ab..e6da34e816 100644 --- a/libavformat/ogg2.c +++ b/libavformat/ogg2.c @@ -44,7 +44,7 @@ static ogg_codec_t *ogg_codecs[] = { NULL }; -#if 0 // CONFIG_ENCODERS +#if 0 // CONFIG_MUXERS static int ogg_write_header (AVFormatContext * avfcontext) { @@ -74,7 +74,7 @@ static AVOutputFormat ogg_oformat = { ogg_write_packet, ogg_write_trailer, }; -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS //FIXME We could avoid some structure duplication static int @@ -638,7 +638,7 @@ static AVInputFormat ogg_iformat = { int ogg_init (void) { -#if 0 // CONFIG_ENCODERS +#if 0 // CONFIG_MUXERS av_register_output_format (&ogg_oformat); #endif av_register_input_format (&ogg_iformat); diff --git a/libavformat/raw.c b/libavformat/raw.c index b1a5762f79..68b8e01228 100644 --- a/libavformat/raw.c +++ b/libavformat/raw.c @@ -18,7 +18,7 @@ */ #include "avformat.h" -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS /* simple formats */ static int raw_write_header(struct AVFormatContext *s) { @@ -36,7 +36,7 @@ static int raw_write_trailer(struct AVFormatContext *s) { return 0; } -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS /* raw input */ static int raw_read_header(AVFormatContext *s, AVFormatParameters *ap) @@ -329,7 +329,7 @@ AVInputFormat ac3_iformat = { .extensions = "ac3", }; -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS AVOutputFormat ac3_oformat = { "ac3", "raw ac3", @@ -342,7 +342,7 @@ AVOutputFormat ac3_oformat = { raw_write_packet, raw_write_trailer, }; -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS AVInputFormat dts_iformat = { "dts", @@ -367,7 +367,7 @@ AVInputFormat h261_iformat = { .value = CODEC_ID_H261, }; -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS AVOutputFormat h261_oformat = { "h261", "raw h261", @@ -380,7 +380,7 @@ AVOutputFormat h261_oformat = { raw_write_packet, raw_write_trailer, }; -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS AVInputFormat h263_iformat = { "h263", @@ -394,7 +394,7 @@ AVInputFormat h263_iformat = { .value = CODEC_ID_H263, }; -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS AVOutputFormat h263_oformat = { "h263", "raw h263", @@ -407,7 +407,7 @@ AVOutputFormat h263_oformat = { raw_write_packet, raw_write_trailer, }; -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS AVInputFormat m4v_iformat = { "m4v", @@ -421,7 +421,7 @@ AVInputFormat m4v_iformat = { .value = CODEC_ID_MPEG4, }; -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS AVOutputFormat m4v_oformat = { "m4v", "raw MPEG4 video format", @@ -434,7 +434,7 @@ AVOutputFormat m4v_oformat = { raw_write_packet, raw_write_trailer, }; -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS AVInputFormat h264_iformat = { "h264", @@ -448,7 +448,7 @@ AVInputFormat h264_iformat = { .value = CODEC_ID_H264, }; -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS AVOutputFormat h264_oformat = { "h264", "raw H264 video format", @@ -461,7 +461,7 @@ AVOutputFormat h264_oformat = { raw_write_packet, raw_write_trailer, }; -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS AVInputFormat mpegvideo_iformat = { "mpegvideo", @@ -474,7 +474,7 @@ AVInputFormat mpegvideo_iformat = { .value = CODEC_ID_MPEG1VIDEO, }; -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS AVOutputFormat mpeg1video_oformat = { "mpeg1video", "MPEG video", @@ -487,9 +487,9 @@ AVOutputFormat mpeg1video_oformat = { raw_write_packet, raw_write_trailer, }; -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS AVOutputFormat mpeg2video_oformat = { "mpeg2video", "MPEG2 video", @@ -502,7 +502,7 @@ AVOutputFormat mpeg2video_oformat = { raw_write_packet, raw_write_trailer, }; -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS AVInputFormat mjpeg_iformat = { "mjpeg", @@ -516,7 +516,7 @@ AVInputFormat mjpeg_iformat = { .value = CODEC_ID_MJPEG, }; -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS AVOutputFormat mjpeg_oformat = { "mjpeg", "MJPEG video", @@ -529,7 +529,7 @@ AVOutputFormat mjpeg_oformat = { raw_write_packet, raw_write_trailer, }; -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS /* pcm formats */ @@ -547,7 +547,7 @@ AVInputFormat pcm_ ## name ## _iformat = {\ .value = codec,\ }; -#if !defined(CONFIG_ENCODERS) && defined(CONFIG_DECODERS) +#if !defined(CONFIG_MUXERS) && defined(CONFIG_DEMUXERS) #define PCMDEF(name, long_name, ext, codec) \ PCMINPUTDEF(name, long_name, ext, codec) @@ -569,7 +569,7 @@ AVOutputFormat pcm_ ## name ## _oformat = {\ raw_write_packet,\ raw_write_trailer,\ }; -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS #ifdef WORDS_BIGENDIAN #define BE_DEF(s) s @@ -638,7 +638,7 @@ AVInputFormat rawvideo_iformat = { .value = CODEC_ID_RAWVIDEO, }; -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS AVOutputFormat rawvideo_oformat = { "rawvideo", "raw video format", @@ -651,9 +651,9 @@ AVOutputFormat rawvideo_oformat = { raw_write_packet, raw_write_trailer, }; -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS static int null_write_packet(struct AVFormatContext *s, AVPacket *pkt) { return 0; @@ -676,12 +676,12 @@ AVOutputFormat null_oformat = { raw_write_trailer, .flags = AVFMT_NOFILE | AVFMT_RAWPICTURE, }; -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS -#ifndef CONFIG_ENCODERS +#ifndef CONFIG_MUXERS #define av_register_output_format(format) #endif -#ifndef CONFIG_DECODERS +#ifndef CONFIG_DEMUXERS #define av_register_input_format(format) #endif diff --git a/libavformat/rm.c b/libavformat/rm.c index 4568f4f1d2..683fcc9580 100644 --- a/libavformat/rm.c +++ b/libavformat/rm.c @@ -44,7 +44,7 @@ typedef struct { int remaining_len; } RMContext; -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS static void put_str(ByteIOContext *s, const char *tag) { put_be16(s,strlen(tag)); @@ -443,7 +443,7 @@ static int rm_write_trailer(AVFormatContext *s) put_flush_packet(pb); return 0; } -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS /***************************************************/ @@ -969,7 +969,7 @@ static AVInputFormat rm_iformat = { rm_read_dts, }; -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS static AVOutputFormat rm_oformat = { "rm", "rm format", @@ -982,13 +982,13 @@ static AVOutputFormat rm_oformat = { rm_write_packet, rm_write_trailer, }; -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS int rm_init(void) { av_register_input_format(&rm_iformat); -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS av_register_output_format(&rm_oformat); -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS return 0; } diff --git a/libavformat/sgi.c b/libavformat/sgi.c index bbf700bc4f..a6de0fffbd 100644 --- a/libavformat/sgi.c +++ b/libavformat/sgi.c @@ -260,7 +260,7 @@ static int sgi_read(ByteIOContext *f, return 0; /* not reached */ } -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS static void write_sgi_header(ByteIOContext *f, const SGIInfo *info) { int i; @@ -442,7 +442,7 @@ static int sgi_write(ByteIOContext *pb, AVImageInfo *info) return 0; } -#endif // CONFIG_ENCODERS +#endif // CONFIG_MUXERS AVImageFormat sgi_image_format = { "sgi", @@ -450,9 +450,9 @@ AVImageFormat sgi_image_format = { sgi_probe, sgi_read, (1 << PIX_FMT_GRAY8) | (1 << PIX_FMT_RGB24) | (1 << PIX_FMT_RGBA32), -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS sgi_write, #else NULL, -#endif // CONFIG_ENCODERS +#endif // CONFIG_MUXERS }; diff --git a/libavformat/swf.c b/libavformat/swf.c index 923a4f9934..258bb2fdb7 100644 --- a/libavformat/swf.c +++ b/libavformat/swf.c @@ -148,7 +148,7 @@ static int swf_mp3_info(void *data, int *byteSize, int *samplesPerFrame, int *sa return 1; } -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS static void put_swf_tag(AVFormatContext *s, int tag) { SWFContext *swf = s->priv_data; @@ -691,7 +691,7 @@ static int swf_write_trailer(AVFormatContext *s) return 0; } -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS /*********************************************/ /* Extract FLV encoded frame and MP3 from swf @@ -909,7 +909,7 @@ static AVInputFormat swf_iformat = { swf_read_close, }; -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS static AVOutputFormat swf_oformat = { "swf", "Flash format", @@ -922,13 +922,13 @@ static AVOutputFormat swf_oformat = { swf_write_packet, swf_write_trailer, }; -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS int swf_init(void) { av_register_input_format(&swf_iformat); -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS av_register_output_format(&swf_oformat); -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS return 0; } diff --git a/libavformat/wav.c b/libavformat/wav.c index e566f5ee6b..b51e2ce004 100644 --- a/libavformat/wav.c +++ b/libavformat/wav.c @@ -46,7 +46,7 @@ const CodecTag codec_wav_tags[] = { { 0, 0 }, }; -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS /* WAVEFORMATEX header */ /* returns the size or -1 on error */ int put_wav_header(ByteIOContext *pb, AVCodecContext *enc) @@ -135,7 +135,7 @@ int put_wav_header(ByteIOContext *pb, AVCodecContext *enc) return hdrsize; } -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS /* We could be given one of the three possible structures here: * WAVEFORMAT, PCMWAVEFORMAT or WAVEFORMATEX. Each structure @@ -194,7 +194,7 @@ int wav_codec_get_id(unsigned int tag, int bps) return id; } -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS typedef struct { offset_t data; } WAVContext; @@ -253,7 +253,7 @@ static int wav_write_trailer(AVFormatContext *s) } return 0; } -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS /* return the size of the found tag */ /* XXX: > 2GB ? */ @@ -395,7 +395,7 @@ static AVInputFormat wav_iformat = { wav_read_seek, }; -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS static AVOutputFormat wav_oformat = { "wav", "wav format", @@ -408,13 +408,13 @@ static AVOutputFormat wav_oformat = { wav_write_packet, wav_write_trailer, }; -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS int ff_wav_init(void) { av_register_input_format(&wav_iformat); -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS av_register_output_format(&wav_oformat); -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS return 0; } diff --git a/libavformat/yuv4mpeg.c b/libavformat/yuv4mpeg.c index 30fdc54db5..2078b63199 100644 --- a/libavformat/yuv4mpeg.c +++ b/libavformat/yuv4mpeg.c @@ -22,7 +22,7 @@ #define Y4M_FRAME_MAGIC "FRAME" #define Y4M_LINE_MAX 256 -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS static int yuv4_generate_header(AVFormatContext *s, char* buf) { @@ -179,7 +179,7 @@ AVOutputFormat yuv4mpegpipe_oformat = { yuv4_write_trailer, .flags = AVFMT_RAWPICTURE, }; -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS /* Header size increased to allow room for optional flags */ #define MAX_YUV4_HEADER 80 @@ -393,9 +393,9 @@ AVInputFormat yuv4mpegpipe_iformat = { int yuv4mpeg_init(void) { av_register_input_format(&yuv4mpegpipe_iformat); -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS av_register_output_format(&yuv4mpegpipe_oformat); -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS return 0; }