changeset 905:dbc0145bbf11 libavformat

Add --disable-protocols option to configure to disable I/O protocol from libavformat. Also fix build with --disable-muxers and --disable-ffserver. patch by Gildas Bazin < gbazin **@** altern **.** org >

--- a/Makefile	Fri Jan 20 23:48:16 2006 +0000
+++ b/Makefile	Sat Jan 21 18:36:32 2006 +0000
@@ -11,13 +11,20 @@
 OBJS= utils.o cutils.o os_support.o allformats.o
 PPOBJS=
 
-# mux and demuxes
+# demuxers
 OBJS+=mpeg.o mpegts.o mpegtsenc.o ffm.o crc.o img.o img2.o raw.o rm.o \
       avienc.o avidec.o wav.o mmf.o swf.o au.o gif.o mov.o mpjpeg.o dv.o \
-      yuv4mpeg.o 4xm.o flvenc.o flvdec.o movenc.o psxstr.o idroq.o ipmovie.o \
+      yuv4mpeg.o 4xm.o flvdec.o psxstr.o idroq.o ipmovie.o \
       nut.o wc3movie.o mp3.o westwood.o segafilm.o idcin.o flic.o \
-      sierravmd.o matroska.o sol.o electronicarts.o nsvdec.o asf.o asf-enc.o \
+      sierravmd.o matroska.o sol.o electronicarts.o nsvdec.o asf.o \
       ogg2.o oggparsevorbis.o oggparsetheora.o oggparseflac.o daud.o
+
+# muxers
+ifeq ($(CONFIG_MUXERS),yes)
+OBJS+= flvenc.o movenc.o asf-enc.o
+endif
+
+
 AMROBJS=
 ifeq ($(AMR_NB),yes)
 AMROBJS= amr.o
@@ -32,8 +39,6 @@
 
 # image formats
 OBJS+= pnm.o yuv.o png.o jpeg.o gifdec.o sgi.o
-# file I/O
-OBJS+= avio.o aviobuf.o file.o
 OBJS+= framehook.o
 
 ifeq ($(CONFIG_VIDEO4LINUX),yes)
@@ -62,6 +67,11 @@
 PPOBJS+= beosaudio.o
 endif
 
+# protocols I/O
+OBJS+= avio.o aviobuf.o
+
+ifeq ($(CONFIG_PROTOCOLS),yes)
+OBJS+= file.o
 ifeq ($(CONFIG_NETWORK),yes)
 OBJS+= udp.o tcp.o http.o rtsp.o rtp.o rtpproto.o
 # BeOS and Darwin network stuff
@@ -69,6 +79,7 @@
 OBJS+= barpainet.o
 endif
 endif
+endif
 
 ifeq ($(CONFIG_LIBOGG),yes)
 OBJS+= ogg.o

--- a/allformats.c	Fri Jan 20 23:48:16 2006 +0000
+++ b/allformats.c	Sat Jan 21 18:36:32 2006 +0000
@@ -130,6 +130,7 @@
 //    av_register_image_format(&sgi_image_format); heap corruption, dont enable
 #endif //CONFIG_MUXERS
 
+#ifdef CONFIG_PROTOCOLS
     /* file protocols */
     register_protocol(&file_protocol);
     register_protocol(&pipe_protocol);
@@ -141,4 +142,5 @@
     register_protocol(&tcp_protocol);
     register_protocol(&http_protocol);
 #endif
+#endif
 }

--- a/avio.c	Fri Jan 20 23:48:16 2006 +0000
+++ b/avio.c	Sat Jan 21 18:36:32 2006 +0000
@@ -100,7 +100,7 @@
     return ret;
 }
 
-#ifdef CONFIG_MUXERS
+#if defined(CONFIG_MUXERS) || defined(CONFIG_PROTOCOLS)
 int url_write(URLContext *h, unsigned char *buf, int size)
 {
     int ret;
@@ -112,7 +112,7 @@
     ret = h->prot->url_write(h, buf, size);
     return ret;
 }
-#endif //CONFIG_MUXERS
+#endif //CONFIG_MUXERS || CONFIG_PROTOCOLS
 
 offset_t url_seek(URLContext *h, offset_t pos, int whence)
 {

--- a/aviobuf.c	Fri Jan 20 23:48:16 2006 +0000
+++ b/aviobuf.c	Sat Jan 21 18:36:32 2006 +0000
@@ -53,8 +53,6 @@
     return 0;
 }
 
-
-#ifdef CONFIG_MUXERS
 static void flush_buffer(ByteIOContext *s)
 {
     if (s->buf_ptr > s->buffer) {
@@ -104,7 +102,6 @@
     flush_buffer(s);
     s->must_flush = 0;
 }
-#endif //CONFIG_MUXERS
 
 offset_t url_fseek(ByteIOContext *s, offset_t offset, int whence)
 {
@@ -193,7 +190,7 @@
     return s->error;
 }
 
-#ifdef CONFIG_MUXERS
+#if defined(CONFIG_MUXERS) || defined(CONFIG_PROTOCOLS)
 void put_le32(ByteIOContext *s, unsigned int val)
 {
     put_byte(s, val);
@@ -254,7 +251,7 @@
         put_byte(s, *tag++);
     }
 }
-#endif //CONFIG_MUXERS
+#endif //CONFIG_MUXERS || CONFIG_PROTOCOLS
 
 /* Input stream */
 

--- a/ffm.c	Fri Jan 20 23:48:16 2006 +0000
+++ b/ffm.c	Sat Jan 21 18:36:32 2006 +0000
@@ -706,6 +706,7 @@
     return 0;
 }
 
+#ifdef CONFIG_FFSERVER
 offset_t ffm_read_write_index(int fd)
 {
     uint8_t buf[8];
@@ -737,6 +738,7 @@
     ffm->write_index = pos;
     ffm->file_size = file_size;
 }
+#endif // CONFIG_FFSERVER
 
 static int ffm_read_close(AVFormatContext *s)
 {