[SCM] libav/experimental: Put muxer-specific code parts in #ifdef CONFIG_MUXERS. based on a patch by Luca Abeni < lucabe72 #@# email #.# it >

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 8228bff5c6394e5aba24c63ab9d72bf96f8047de
Author: Diego Biurrun <diego at biurrun.de>
Date:   Thu Jan 19 23:36:50 2006 +0000

    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

diff --git a/libavformat/crc.c b/libavformat/crc.c
index d28a87c..63eaf1b 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 3124c80..0cf967b 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 46d8248..e38c694 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;
 }

-- 
Libav/FFmpeg packaging