From 8228bff5c6394e5aba24c63ab9d72bf96f8047de Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Thu, 19 Jan 2006 23:36:50 +0000 Subject: [PATCH] Put muxer-specific code parts in #ifdef CONFIG_MUXERS. based on a patch by Luca Abeni < lucabe72 #@# email #.# it > Originally committed as revision 4871 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/crc.c | 2 ++ libavformat/dv.c | 6 ++++++ libavformat/img2.c | 11 +++++++++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/libavformat/crc.c b/libavformat/crc.c index d28a87cdf5..63eaf1bcdb 100644 --- a/libavformat/crc.c +++ b/libavformat/crc.c @@ -56,6 +56,7 @@ unsigned long update_adler32(unsigned long adler, const uint8_t *buf, unsigned i } return (s2 << 16) | s1; } +#ifdef CONFIG_MUXERS typedef struct CRCState { uint32_t crcval; @@ -132,3 +133,4 @@ int crc_init(void) av_register_output_format(&framecrc_format); return 0; } +#endif /* CONFIG_MUXERS */ diff --git a/libavformat/dv.c b/libavformat/dv.c index 3124c80699..0cf967bb5d 100644 --- a/libavformat/dv.c +++ b/libavformat/dv.c @@ -907,6 +907,7 @@ static int dv_read_close(AVFormatContext *s) return 0; } +#ifdef CONFIG_MUXERS static int dv_write_header(AVFormatContext *s) { s->priv_data = dv_init_mux(s); @@ -944,6 +945,7 @@ static int dv_write_trailer(struct AVFormatContext *s) dv_delete_mux((DVMuxContext *)s->priv_data); return 0; } +#endif /* CONFIG_MUXERS */ static AVInputFormat dv_iformat = { "dv", @@ -957,6 +959,7 @@ static AVInputFormat dv_iformat = { .extensions = "dv,dif", }; +#ifdef CONFIG_MUXERS static AVOutputFormat dv_oformat = { "dv", "DV video format", @@ -969,10 +972,13 @@ static AVOutputFormat dv_oformat = { dv_write_packet, dv_write_trailer, }; +#endif int ff_dv_init(void) { av_register_input_format(&dv_iformat); +#ifdef CONFIG_MUXERS av_register_output_format(&dv_oformat); +#endif return 0; } diff --git a/libavformat/img2.c b/libavformat/img2.c index 46d8248017..e38c694fc5 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -291,6 +291,7 @@ static int img_read_close(AVFormatContext *s1) return 0; } +#ifdef CONFIG_MUXERS /******************************************************/ /* image output */ @@ -360,6 +361,8 @@ static int img_write_trailer(AVFormatContext *s) return 0; } +#endif /* CONFIG_MUXERS */ + /* input */ static AVInputFormat image2_iformat = { @@ -387,6 +390,7 @@ static AVInputFormat image2pipe_iformat = { }; +#ifdef CONFIG_MUXERS /* output */ static AVOutputFormat image2_oformat = { @@ -415,14 +419,17 @@ static AVOutputFormat image2pipe_oformat = { img_write_packet, img_write_trailer, }; +#endif /* CONFIG_MUXERS */ int img2_init(void) { av_register_input_format(&image2_iformat); - av_register_output_format(&image2_oformat); - av_register_input_format(&image2pipe_iformat); + +#ifdef CONFIG_MUXERS + av_register_output_format(&image2_oformat); av_register_output_format(&image2pipe_oformat); +#endif return 0; }