[Ffmpeg-cvslog] CVS: ffmpeg/libavformat crc.c, 1.13, 1.14 dv.c, 1.49, 1.50 img2.c, 1.20, 1.21

[Diego Biurrun CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavformat
In directory mail:/var2/tmp/cvs-serv14475/libavformat

Modified Files:
	crc.c dv.c img2.c 
Log Message:
Put muxer-specific code parts in #ifdef CONFIG_MUXERS.
based on a patch by Luca Abeni <  lucabe72  #@#  email  #.#  it  >


Index: crc.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/crc.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- crc.c	12 Jan 2006 22:43:22 -0000	1.13
+++ crc.c	19 Jan 2006 23:36:50 -0000	1.14
@@ -56,6 +56,7 @@
     }
     return (s2 << 16) | s1;
 }
+#ifdef CONFIG_MUXERS
 
 typedef struct CRCState {
     uint32_t crcval;
@@ -132,3 +133,4 @@
     av_register_output_format(&framecrc_format);
     return 0;
 }
+#endif /* CONFIG_MUXERS */

Index: dv.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/dv.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- dv.c	12 Jan 2006 22:43:22 -0000	1.49
+++ dv.c	19 Jan 2006 23:36:50 -0000	1.50
@@ -907,6 +907,7 @@
     return 0;
 }
 
+#ifdef CONFIG_MUXERS
 static int dv_write_header(AVFormatContext *s)
 {
     s->priv_data = dv_init_mux(s);
@@ -944,6 +945,7 @@
     dv_delete_mux((DVMuxContext *)s->priv_data);
     return 0;
 }
+#endif /* CONFIG_MUXERS */
 
 static AVInputFormat dv_iformat = {
     "dv",
@@ -957,6 +959,7 @@
     .extensions = "dv,dif",
 };
 
+#ifdef CONFIG_MUXERS
 static AVOutputFormat dv_oformat = {
     "dv",
     "DV video format",
@@ -969,10 +972,13 @@
     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;
 }

Index: img2.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/img2.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- img2.c	12 Jan 2006 22:43:23 -0000	1.20
+++ img2.c	19 Jan 2006 23:36:50 -0000	1.21
@@ -291,6 +291,7 @@
     return 0;
 }
 
+#ifdef CONFIG_MUXERS
 /******************************************************/
 /* image output */
 
@@ -360,6 +361,8 @@
     return 0;
 }
 
+#endif /* CONFIG_MUXERS */
+
 /* input */
 
 static AVInputFormat image2_iformat = {
@@ -387,6 +390,7 @@
 };
 
 
+#ifdef CONFIG_MUXERS
 /* output */
 
 static AVOutputFormat image2_oformat = {
@@ -415,14 +419,17 @@
     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;
 }