September 2005 - ffmpeg-cvslog

CVS: ffmpeg/libavutil Makefile,1.2,1.3
by diego＠mplayerhq.hu 26 Sep '05

26 Sep '05

Update of /cvsroot/ffmpeg/ffmpeg/libavutil In directory mail:/var2/tmp/cvs-serv18838/libavutil Modified Files: Makefile Log Message: support for building dynamic libraries on Mac OS X based on a patch by Lina Pezzella <J4rg0n -- at -- gentoo -- dot -- org> Index: Makefile =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavutil/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile 6 Aug 2005 10:03:08 -0000 1.2 +++ Makefile 26 Sep 2005 10:05:13 -0000 1.3 @@ -22,22 +22,25 @@ LIB= $(LIBPREF)avutil$(LIBSUF) ifeq ($(BUILD_SHARED),yes) -SLIB= $(SLIBPREF)avutil$(SLIBSUF) +SLIBNAME= $(SLIBPREF)avutil$(SLIBSUF) +ifeq ($(CONFIG_DARWIN),yes) +SHFLAGS += -Wl,-install_name,$(libdir)/$(SLIBNAME),-current_version,$(SPPVERSION),-compatibility_version,$(SPPVERSION) +endif endif -all: $(LIB) $(SLIB) +all: $(LIB) $(SLIBNAME) $(LIB): $(OBJS) rm -f $@ $(AR) rc $@ $(OBJS) $(RANLIB) $@ -$(SLIB): $(OBJS) +$(SLIBNAME): $(OBJS) ifeq ($(CONFIG_WIN32),yes) $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) -lib /machine:i386 /def:$(@:.dll=.def) else - $(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) $(LDFLAGS) + $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) endif %.o: %.c @@ -49,7 +52,7 @@ dep: depend clean: - rm -f *.o *.d *~ .depend $(LIB) $(SLIB) *.so + rm -f *.o *.d *~ .depend $(LIB) $(SLIBNAME) *$(SLIBSUF) distclean: clean rm -f Makefile.bak .depend @@ -58,11 +61,11 @@ ifeq ($(BUILD_SHARED),yes) install: all install-headers ifeq ($(CONFIG_WIN32),yes) - install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)" + install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)" else install -d $(libdir) - install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavutil-$(VERSION).so - ln -sf libavutil-$(VERSION).so $(libdir)/libavutil.so + install $(INSTALLSTRIP) -m 755 $(SLIBNAME) $(libdir)/libavutil-$(VERSION)$(SLIBSUF) + ln -sf libavutil-$(VERSION)$(SLIBSUF) $(libdir)/$(SLIBNAME) $(LDCONFIG) || true endif else

1 0

CVS: ffmpeg/libavcodec/libpostproc Makefile, 1.25, 1.26
by diego＠mplayerhq.hu 26 Sep '05

26 Sep '05

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec/libpostproc In directory mail:/var2/tmp/cvs-serv18838/libavcodec/libpostproc Modified Files: Makefile Log Message: support for building dynamic libraries on Mac OS X based on a patch by Lina Pezzella <J4rg0n -- at -- gentoo -- dot -- org> Index: Makefile =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/libpostproc/Makefile,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- Makefile 27 Jun 2005 00:55:29 -0000 1.25 +++ Makefile 26 Sep 2005 10:05:13 -0000 1.26 @@ -4,9 +4,16 @@ VPATH=$(SRC_PATH)/libavcodec/libpostproc ifeq ($(SHARED_PP),yes) -SPPLIB = $(SLIBPREF)postproc$(SLIBSUF) -SPPMAJOR = 0 -SPPVERSION = $(SPPMAJOR).0.1 +SPPLIBNAME = $(SLIBPREF)postproc$(SLIBSUF) +ifeq ($(CONFIG_DARWIN),yes) +SPPLIBMAJOR = $(SLIBPREF)postproc.$(SPPMAJOR)$(SLIBSUF) +SPPLIB = $(SLIBPREF)postproc.$(SPPVERSION)$(SLIBSUF) +SHFLAGS += -Wl,-install_name,$(libdir)/$(SPPLIBNAME),-current_version,$(SPPVERSION),-compatibility_version,$(SPPVERSION) +else +SPPLIBMAJOR = $(SPPLIBNAME).$(SPPMAJOR) +SPPLIB = $(SPPLIBNAME).$(SPPVERSION) +SHFLAGS = -shared -Wl,-soname,$(SPPLIB) +endif endif PPLIB = $(LIBPREF)postproc$(LIBSUF) @@ -23,13 +30,13 @@ .c.o: $(CC) -c $(CFLAGS) $(LIBOBJFLAGS) -I$(SRC_PATH)/libavcodec -I../.. -o $@ $< -all: $(SWSLIB) $(PPLIB) $(SPPLIB) +all: $(SWSLIB) $(PPLIB) $(SPPLIBNAME) clean: - rm -f *.o *.a *~ *.so $(PPLIB) $(SPPLIB) + rm -f *.o *.a *~ *$(SLIBSUF) $(PPLIB) $(SPPLIBNAME) distclean: - rm -f Makefile.bak *.o *.a *~ *.so .depend + rm -f Makefile.bak *.o *.a *~ *$(SLIBSUF) .depend dep: depend @@ -40,9 +47,8 @@ postprocess_pic.o: postprocess.c $(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -I.. -I../.. -o $@ $< -$(SPPLIB): $(SPPOBJS) - $(CC) -shared -Wl,-soname,$(SPPLIB).$(SPPMAJOR) \ - -o $(SPPLIB) $(SPPOBJS) +$(SPPLIBNAME): $(SPPOBJS) + $(CC) $(SHFLAGS) -o $(SPPLIBNAME) $(SPPOBJS) endif $(PPLIB): $(PPOBJS) @@ -53,12 +59,12 @@ install: all ifeq ($(SHARED_PP),yes) ifeq ($(CONFIG_WIN32),yes) - install $(INSTALLSTRIP) -m 755 $(SPPLIB) "$(prefix)" + install $(INSTALLSTRIP) -m 755 $(SPPLIBNAME) "$(prefix)" else install -d $(libdir) - install $(INSTALLSTRIP) -m 755 $(SPPLIB) $(libdir)/$(SPPLIB).$(SPPVERSION) - ln -sf $(SPPLIB).$(SPPVERSION) $(libdir)/$(SPPLIB) - ln -sf $(SPPLIB).$(SPPVERSION) $(libdir)/$(SPPLIB).$(SPPMAJOR) + install $(INSTALLSTRIP) -m 755 $(SPPLIBNAME) $(libdir)/$(SPPLIB) + ln -sf $(SPPLIB) $(libdir)/$(SPPLIBNAME) + ln -sf $(SPPLIB) $(libdir)/$(SPPLIBMAJOR) install -d $(libdir)/pkgconfig install -m 644 ../../libpostproc.pc $(libdir)/pkgconfig $(LDCONFIG) || true

1 0

CVS: ffmpeg/libavformat Makefile,1.99,1.100
by diego＠mplayerhq.hu 26 Sep '05

26 Sep '05

Update of /cvsroot/ffmpeg/ffmpeg/libavformat In directory mail:/var2/tmp/cvs-serv18838/libavformat Modified Files: Makefile Log Message: support for building dynamic libraries on Mac OS X based on a patch by Lina Pezzella <J4rg0n -- at -- gentoo -- dot -- org> Index: Makefile =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/Makefile,v retrieving revision 1.99 retrieving revision 1.100 diff -u -d -r1.99 -r1.100 --- Makefile 2 Sep 2005 19:18:59 -0000 1.99 +++ Makefile 26 Sep 2005 10:05:13 -0000 1.100 @@ -81,9 +81,11 @@ LIB= $(LIBPREF)avformat$(LIBSUF) ifeq ($(BUILD_SHARED),yes) -SLIB= $(SLIBPREF)avformat$(SLIBSUF) - -AVCLIBS+=-lavcodec$(BUILDSUF) -L../libavcodec +SLIBNAME= $(SLIBPREF)avformat$(SLIBSUF) +AVCLIBS+=-lavcodec$(BUILDSUF) -L../libavcodec -lavutil$(BUILDSUF) -L../libavutil +ifeq ($(CONFIG_DARWIN),yes) +SHFLAGS += -Wl,-install_name,$(libdir)/$(SLIBNAME),-current_version,$(SPPVERSION),-compatibility_version,$(SPPVERSION) +endif ifeq ($(CONFIG_MP3LAME),yes) AVCLIBS+=-lmp3lame endif @@ -91,14 +93,14 @@ SRCS := $(OBJS:.o=.c) $(PPOBJS:.o=.cpp) -all: $(LIB) $(SLIB) +all: $(LIB) $(SLIBNAME) $(LIB): $(OBJS) $(PPOBJS) rm -f $@ $(AR) rc $@ $(OBJS) $(PPOBJS) $(RANLIB) $@ -$(SLIB): $(OBJS) +$(SLIBNAME): $(OBJS) ifeq ($(CONFIG_WIN32),yes) $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(PPOBJS) $(AVCLIBS) $(EXTRALIBS) -lib /machine:i386 /def:$(@:.dll=.def) @@ -112,11 +114,11 @@ ifeq ($(BUILD_SHARED),yes) install: all install-headers ifeq ($(CONFIG_WIN32),yes) - install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)" + install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)" else install -d $(libdir) - install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavformat-$(VERSION).so - ln -sf libavformat-$(VERSION).so $(libdir)/libavformat.so + install $(INSTALLSTRIP) -m 755 $(SLIBNAME) $(libdir)/$(SLIBPREF)avformat-$(VERSION)$(SLIBSUF) + ln -sf $(SLIBPREF)avformat-$(VERSION)$(SLIBSUF) $(libdir)/$(SLIBNAME) $(LDCONFIG) || true endif else @@ -143,7 +145,7 @@ g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $< distclean clean: - rm -f *.o *.d .depend *~ *.a *.so $(LIB) + rm -f *.o *.d .depend *~ *.a *$(SLIBSUF) $(LIB) # # include dependency files if they exist

1 0

CVS: ffmpeg/vhook Makefile,1.22,1.23
by diego＠mplayerhq.hu 26 Sep '05

26 Sep '05

Update of /cvsroot/ffmpeg/ffmpeg/vhook In directory mail:/var2/tmp/cvs-serv18838/vhook Modified Files: Makefile Log Message: support for building dynamic libraries on Mac OS X based on a patch by Lina Pezzella <J4rg0n -- at -- gentoo -- dot -- org> Index: Makefile =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/vhook/Makefile,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- Makefile 1 Aug 2005 20:07:05 -0000 1.22 +++ Makefile 26 Sep 2005 10:05:13 -0000 1.23 @@ -5,22 +5,22 @@ CFLAGS=-fPIC $(SHCFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavutil -DHAVE_AV_CONFIG_H ifeq ($(CONFIG_DARWIN),yes) -SHFLAGS+=-flat_namespace -undefined suppress + SHFLAGS += -flat_namespace endif -HOOKS=null.so fish.so ppm.so watermark.so +HOOKS=null$(SLIBSUF) fish$(SLIBSUF) ppm$(SLIBSUF) watermark$(SLIBSUF) ifeq ($(HAVE_IMLIB2),yes) - HOOKS += imlib2.so + HOOKS += imlib2$(SLIBSUF) endif ifeq ($(HAVE_FREETYPE2),yes) - HOOKS += drawtext.so + HOOKS += drawtext$(SLIBSUF) CFLAGS += `freetype-config --cflags` endif all: $(HOOKS) -SRCS := $(HOOKS:.so=.c) +SRCS := $(HOOKS:$(SLIBSUF)=.c) depend: $(SRCS) $(CC) -MM $(CFLAGS) $^ 1>.depend @@ -29,17 +29,21 @@ install -d "$(libdir)/vhook" install -m 755 $(HOOKS) "$(libdir)/vhook" -imlib2.so: imlib2.o +imlib2$(SLIBSUF): imlib2.o $(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $< -lImlib2 -drawtext.so: drawtext.o +drawtext$(SLIBSUF): drawtext.o $(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $< `freetype-config --libs` -%.so: %.o +%$(SLIBSUF): %.o +ifeq ($(CONFIG_DARWIN),yes) + $(CC) $(LDFLAGS) $(SHFLAGS) -Wl,-install_name,$(libdir)/vhoook/$@ -g -o $@ $< +else $(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $< +endif clean: - rm -f *.o *.d .depend *.so *~ + rm -f *.o *.d .depend *$(SLIBSUF) *~ ifneq ($(wildcard .depend),) include .depend

1 0

CVS: ffmpeg/libavcodec Makefile,1.201,1.202
by diego＠mplayerhq.hu 26 Sep '05

26 Sep '05

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv18838/libavcodec Modified Files: Makefile Log Message: support for building dynamic libraries on Mac OS X based on a patch by Lina Pezzella <J4rg0n -- at -- gentoo -- dot -- org> Index: Makefile =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/Makefile,v retrieving revision 1.201 retrieving revision 1.202 diff -u -d -r1.201 -r1.202 --- Makefile 10 Sep 2005 23:00:13 -0000 1.201 +++ Makefile 26 Sep 2005 10:05:13 -0000 1.202 @@ -377,17 +377,22 @@ CFLAGS+= -mcpu=ultrasparc -mtune=ultrasparc endif +# Darwin specific stuff +ifeq ($(CONFIG_DARWIN),yes) +SHFLAGS += -Wl,-install_name,$(libdir)/$(SLIBPREF)avcodec$(SLIBSUF),-current_version,$(SPPVERSION),-compatibility_version,$(SPPVERSION) +endif + SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S) OBJS := $(OBJS) $(ASM_OBJS) LIB= $(LIBPREF)avcodec$(LIBSUF) LIBAVUTIL= $(SRC_PATH)/libavutil/$(LIBPREF)avutil$(LIBSUF) ifeq ($(BUILD_SHARED),yes) -SLIB= $(SLIBPREF)avcodec$(SLIBSUF) +SLIBNAME= $(SLIBPREF)avcodec$(SLIBSUF) endif TESTS= imgresample-test dct-test motion-test fft-test -all: $(LIB) $(SLIB) +all: $(LIB) $(SLIBNAME) amrlibs: $(MAKE) -C amr spclib fipoplib @@ -399,7 +404,7 @@ $(AR) rc $@ $(OBJS) $(AMREXTRALIBS) $(RANLIB) $@ -$(SLIB): $(OBJS) +$(SLIBNAME): $(OBJS) ifeq ($(CONFIG_PP),yes) $(MAKE) -C libpostproc endif @@ -407,7 +412,7 @@ $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) -lib /machine:i386 /def:$(@:.dll=.def) else - $(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) $(LDFLAGS) + $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) endif dsputil.o: dsputil.c dsputil.h @@ -427,7 +432,7 @@ dep: depend clean: $(CLEANAMR) - rm -f *.o *.d *~ .depend $(LIB) $(SLIB) *.so i386/*.o i386/*~ \ + rm -f *.o *.d *~ .depend $(LIB) $(SLIBNAME) *$(SLIBSUF) i386/*.o i386/*~ \ armv4l/*.o armv4l/*~ \ mlib/*.o mlib/*~ \ alpha/*.o alpha/*~ \ @@ -476,11 +481,11 @@ ifeq ($(BUILD_SHARED),yes) install: all install-headers ifeq ($(CONFIG_WIN32),yes) - install $(INSTALLSTRIP) -m 755 $(SLIB) "$(prefix)" + install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)" else install -d $(libdir) - install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavcodec-$(VERSION).so - ln -sf libavcodec-$(VERSION).so $(libdir)/libavcodec.so + install $(INSTALLSTRIP) -m 755 $(SLIBNAME) $(libdir)/libavcodec-$(VERSION)$(SLIBSUF) + ln -sf libavcodec-$(VERSION)$(SLIBSUF) $(libdir)/libavcodec$(SLIBSUF) $(LDCONFIG) || true endif ifeq ($(CONFIG_PP),yes)

1 0

CVS: ffmpeg configure,1.204,1.205
by diego＠mplayerhq.hu 26 Sep '05

26 Sep '05

Update of /cvsroot/ffmpeg/ffmpeg In directory mail:/var2/tmp/cvs-serv18838 Modified Files: configure Log Message: support for building dynamic libraries on Mac OS X based on a patch by Lina Pezzella <J4rg0n -- at -- gentoo -- dot -- org> Index: configure =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/configure,v retrieving revision 1.204 retrieving revision 1.205 diff -u -d -r1.204 -r1.205 --- configure 24 Sep 2005 17:10:25 -0000 1.204 +++ configure 26 Sep 2005 10:05:12 -0000 1.205 @@ -329,11 +329,12 @@ audio_oss="no" dv1394="no" ffserver="no" -SHFLAGS="-dynamiclib" +SHFLAGS="-dynamiclib -Wl,-single_module,-undefined,dynamic_lookup" extralibs="" darwin="yes" strip="strip -x" -LDFLAGS="-Wl,-search_paths_first" +LDFLAGS="-Wl,-dynamic,-search_paths_first" +SLIBSUF=".dylib" FFSLDFLAGS=-Wl,-bind_at_load ;; MINGW32*) @@ -1428,6 +1429,8 @@ if test "$lshared" = "yes" ; then echo "BUILD_SHARED=yes" >> config.mak echo "PIC=-fPIC -DPIC" >> config.mak + echo "SPPMAJOR=0" >> config.mak + echo "SPPVERSION=0.0.1" >> config.mak fi echo "EXTRALIBS=$extralibs" >> config.mak version=`grep '#define FFMPEG_VERSION ' "$source_path/libavcodec/avcodec.h" |

1 0

CVS: ffmpeg/libavcodec amr.c,1.9,1.10
by diego＠mplayerhq.hu 24 Sep '05

24 Sep '05

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec In directory mail:/var2/tmp/cvs-serv19418/libavcodec Modified Files: amr.c Log Message: Fix some #ifdef to allow building amr_wb alone. patch by Michel Bardiaux < mbardiaux -- dot -- mediaxim -- dot -- be > Index: amr.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/amr.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- amr.c 22 Mar 2005 18:28:15 -0000 1.9 +++ amr.c 24 Sep 2005 17:42:56 -0000 1.10 @@ -326,7 +326,7 @@ } -#else /* Float point version*/ +#elif defined(AMR_NB) /* Float point version*/ typedef struct AMRContext { int frameCount; @@ -457,6 +457,8 @@ #endif +#if defined(AMR_NB) || defined(AMR_NB_FIXED) + AVCodec amr_nb_decoder = { "amr_nb", @@ -481,6 +483,8 @@ NULL, }; +#endif + /* -----------AMR wideband ------------*/ #ifdef AMR_WB

1 0

CVS: ffmpeg configure,1.203,1.204
by diego＠mplayerhq.hu 24 Sep '05

24 Sep '05

Update of /cvsroot/ffmpeg/ffmpeg In directory mail:/var2/tmp/cvs-serv5602 Modified Files: configure Log Message: Tell configure about hppa, s390, mipsel, m68k and ia64 architectures. patch by Sam Hocevar < sam -- at -- zoy -- dot -- org > Index: configure =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/configure,v retrieving revision 1.203 retrieving revision 1.204 diff -u -d -r1.203 -r1.204 --- configure 24 Sep 2005 17:06:50 -0000 1.203 +++ configure 24 Sep 2005 17:10:25 -0000 1.204 @@ -146,7 +146,7 @@ "Power Macintosh"|ppc) cpu="powerpc" ;; - mips) + mips|mipsel) cpu="mips" ;; sun4u|sparc64) @@ -158,6 +158,18 @@ sh4) cpu="sh4" ;; + parisc|parisc64) + cpu="parisc" + ;; + s390|s390x) + cpu="s390" + ;; + m68k) + cpu="m68k" + ;; + ia64) + cpu="ia64" + ;; *) cpu="unknown" ;; @@ -1320,6 +1332,18 @@ elif test "$cpu" = "sh4" ; then echo "TARGET_ARCH_SH4=yes" >> config.mak echo "#define ARCH_SH4 1" >> $TMPH +elif test "$cpu" = "parisc" ; then + echo "TARGET_ARCH_PARISC=yes" >> config.mak + echo "#define ARCH_PARISC 1" >> $TMPH +elif test "$cpu" = "s390" ; then + echo "TARGET_ARCH_S390=yes" >> config.mak + echo "#define ARCH_S390 1" >> $TMPH +elif test "$cpu" = "m68k" ; then + echo "TARGET_ARCH_M68K=yes" >> config.mak + echo "#define ARCH_M68K 1" >> $TMPH +elif test "$cpu" = "ia64" ; then + echo "TARGET_ARCH_IA64=yes" >> config.mak + echo "#define ARCH_IA64 1" >> $TMPH fi echo "#define TUNECPU $TUNECPU" >> $TMPH if test "$bigendian" = "yes" ; then

1 0

CVS: ffmpeg configure,1.202,1.203
by diego＠mplayerhq.hu 24 Sep '05

24 Sep '05

Update of /cvsroot/ffmpeg/ffmpeg In directory mail:/var2/tmp/cvs-serv3768 Modified Files: configure Log Message: spelling fixes Index: configure =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/configure,v retrieving revision 1.202 retrieving revision 1.203 diff -u -d -r1.202 -r1.203 --- configure 23 Sep 2005 01:08:48 -0000 1.202 +++ configure 24 Sep 2005 17:06:50 -0000 1.203 @@ -14,35 +14,38 @@ echo " --help print this message" echo " --prefix=PREFIX install in PREFIX [$prefix]" echo " --libdir=DIR install libs in DIR [PREFIX/lib]" -echo " --mandir=DIR man documentation in DIR [PREFIX/man]" -echo " --enable-mp3lame enable mp3 encoding via libmp3lame [default=no]" -echo " --enable-libogg enable ogg support via libogg [default=no]" -echo " --enable-vorbis enable vorbis support via libvorbis [default=no]" -echo " --enable-theora enable theora support via libtheora [default=no]" -echo " --enable-faad enable faad support via libfaad [default=no]" -echo " --enable-faadbin build faad support with runtime linking [default=no]" -echo " --enable-faac enable faac support via libfaac [default=no]" -echo " --enable-libgsm enable gsm support via libgsm [default=no]" -echo " --enable-xvid enable xvid support via xvidcore [default=no]" +echo " --mandir=DIR install man page in DIR [PREFIX/man]" +echo " --enable-mp3lame enable MP3 encoding via libmp3lame [default=no]" +echo " --enable-libogg enable Ogg support via libogg [default=no]" +echo " --enable-vorbis enable Vorbis support via libvorbis [default=no]" +echo " --enable-theora enable Theora support via libtheora [default=no]" +echo " --enable-faad enable FAAD support via libfaad [default=no]" +echo " --enable-faadbin build FAAD support with runtime linking [default=no]" +echo " --enable-faac enable FAAC support via libfaac [default=no]" +echo " --enable-libgsm enable GSM support via libgsm [default=no]" +echo " --enable-xvid enable XviD support via xvidcore [default=no]" echo " --enable-x264 enable H.264 encoding via x264 [default=no]" -echo " --enable-mingw32 enable mingw32 native/cross windows compile" -echo " --enable-a52 enable GPL'ed A52 support [default=no]" +echo " --enable-mingw32 enable MinGW native/cross Windows compile" +echo " --enable-a52 enable GPLed A52 support [default=no]" echo " --enable-a52bin open liba52.so.0 at runtime [default=no]" -echo " --enable-dts enable GPL'ed DTS support [default=no]" -echo " --enable-pp enable GPL'ed post processing support [default=no]" +echo " --enable-dts enable GPLed DTS support [default=no]" +echo " --enable-pp enable GPLed postprocessing support [default=no]" echo " --enable-shared-pp use libpostproc.so [default=no]" echo " --enable-shared build shared libraries [default=no]" echo " --enable-amr_nb enable amr_nb float audio codec" echo " --enable-amr_nb-fixed use fixed point for amr-nb codec" echo " --enable-amr_wb enable amr_wb float audio codec" +echo " --enable-amr_if2 enable amr_wb IF2 audio codec" echo " --enable-sunmlib use Sun medialib [default=no]" echo " --enable-pthreads use pthreads [default=no]" -echo " --enable-dc1394 enable IIDC-1394 grabbing using libdc1394 and libraw1394 [default=no]" -echo " --enable-gpl allow use of gpl code, the resulting libav* and ffmpeg will be under gpl [default=no]" +echo " --enable-dc1394 enable IIDC-1394 grabbing using libdc1394" +echo " and libraw1394 [default=no]" +echo " --enable-gpl allow use of GPL code, the resulting libav*" +echo " and ffmpeg will be under GPL [default=no]" echo "" echo "Advanced options (experts only):" -echo " --source-path=PATH path of source code [$source_path]" -echo " --cross-prefix=PREFIX use PREFIX for compile tools [$cross_prefix]" +echo " --source-path=PATH path to source code [$source_path]" +echo " --cross-prefix=PREFIX use PREFIX for compilation tools [$cross_prefix]" echo " --cc=CC use C compiler CC [$cc]" echo " --make=MAKE use specified make [$make]" echo " --extra-cflags=ECFLAGS add ECFLAGS to CFLAGS [$CFLAGS]" @@ -50,9 +53,11 @@ echo " --extra-libs=ELIBS add ELIBS [$ELIBS]" echo " --build-suffix=SUFFIX suffix for application specific build []" echo " --cpu=CPU force cpu to CPU [$cpu]" -echo " --tune=PROCESSOR tune code for a particular CPU (may fails or misperforms on other CPUs)" -echo " --powerpc-perf-enable enable performance report on PPC (requires enabling PMC)" -echo " --disable-mmx disable mmx usage" +echo " --tune=CPU tune code for a particular CPU" +echo " (may fail or perform badly on other CPUs)" +echo " --powerpc-perf-enable enable performance report on PPC" +echo " (requires enabling PMC)" +echo " --disable-mmx disable MMX usage" echo " --disable-iwmmxt disable iwmmxt usage" echo " --disable-altivec disable AltiVec usage" echo " --disable-audio-oss disable OSS audio support [default=no]" @@ -68,20 +73,20 @@ echo " --disable-debug disable debugging symbols" echo " --disable-opts disable compiler optimizations" echo " --disable-mpegaudio-hp faster (but less accurate)" -echo " mpegaudio decoding [default=no]" +echo " MPEG audio decoding [default=no]" echo " --disable-ffserver disable ffserver build" echo " --disable-ffplay disable ffplay build" echo " --enable-small optimize for size instead of speed" echo " --enable-memalign-hack emulate memalign, interferes with memory debuggers" echo " --disable-strip disable stripping of executables and shared libraries" -echo " --enable-codec=codec enables codec" -echo " --disable-codec=codec disables codec" +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" +echo "NOTE: Object files are built at the place where configure is launched." exit 1 fi @@ -241,11 +246,11 @@ ;; esac SHFLAGS=-nostart -# disable linux things +# disable Linux things audio_oss="no" v4l="no" dv1394="no" -# enable beos things +# enable BeOS things audio_beos="yes" # no need for libm, but the inet stuff # Check for BONE @@ -321,7 +326,7 @@ ;; MINGW32*) # Note: the rest of the mingw32 config is done afterwards as mingw32 -# can be forced on command line for linux cross compilation +# can be forced on the command line for Linux cross compilation. mingw32="yes" ;; CYGWIN*) @@ -369,9 +374,9 @@ *) ;; esac -# From mplayer configure. We need TARGET_OS available +# From MPlayer configure. We need TARGET_OS available # to the Makefile, so it can distinguish between flavors -# of AltiVec on PowerPC +# of AltiVec on PowerPC. TARGET_OS=`( uname -s ) 2>&1` case "$TARGET_OS" in Linux|FreeBSD|NetBSD|BSD/OS|OpenBSD|SunOS|QNX|Darwin|GNU|BeOS) @@ -551,7 +556,7 @@ if test "$theora" = "yes" ; then if test "$libogg" = "no"; then - echo "libogg must be enabled to enable Theora" + echo "libogg must be enabled to enable Theora." fail="yes" theora="no" fi @@ -559,7 +564,7 @@ if test "$vorbis" = "yes" ; then if test "$libogg" = "no"; then - echo "libogg must be enabled to enable Vorbis" + echo "libogg must be enabled to enable Vorbis." fail="yes" vorbis="no" fi @@ -567,27 +572,27 @@ if test "$gpl" != "yes"; then if test "$pp" != "no" -o "$shared_pp" != "no"; then - echo "The Postprocessing code is under GPL and --enable-gpl is not specified" + echo "The Postprocessing code is under GPL and --enable-gpl is not specified." fail="yes" fi if test "$a52" != "no" -o "$a52bin" != "no"; then - echo "liba52 is under GPL and --enable-gpl is not specified" + echo "liba52 is under GPL and --enable-gpl is not specified." fail="yes" fi if test "$xvid" != "no"; then - echo "libxvidcore is under GPL and --enable-gpl is not specified" + echo "libxvidcore is under GPL and --enable-gpl is not specified." fail="yes" fi if test "$x264" != "no"; then - echo "x264 is under GPL and --enable-gpl is not specified" + echo "x264 is under GPL and --enable-gpl is not specified." fail="yes" fi if test "$dts" != "no"; then - echo "libdts is under GPL and --enable-gpl is not specified" + echo "libdts is under GPL and --enable-gpl is not specified." fail="yes" fi @@ -606,13 +611,13 @@ int main( void ) { return 0; } EOF if $cc $CFLAGS -o $TMPE $TMPC 2> /dev/null ; then - echo "faad2 is under GPL and --enable-gpl is not specified" + echo "FAAD2 is under GPL and --enable-gpl is not specified." fail="yes" fi else faad="no" faadbin="no" - echo "faad test failed" + echo "FAAD test failed." fi fi @@ -622,7 +627,7 @@ fi fi -# compute mmx state +# compute MMX state if test $mmx = "default"; then if test $cpu = "x86" -o $cpu = "x86_64"; then mmx="yes" @@ -689,49 +694,49 @@ 601|ppc601|PowerPC601) CFLAGS="$CFLAGS -mcpu=601" if test $altivec = "yes"; then - echo "WARNING: tuning for PPC601 but altivec enabled !"; + echo "WARNING: Tuning for PPC601 but AltiVec enabled!"; fi TUNECPU=ppc601 ;; 603*|ppc603*|PowerPC603*) CFLAGS="$CFLAGS -mcpu=603" if test $altivec = "yes"; then - echo "WARNING: tuning for PPC603 but altivec enabled !"; + echo "WARNING: Tuning for PPC603 but AltiVec enabled!"; fi TUNECPU=ppc603 ;; 604*|ppc604*|PowerPC604*) CFLAGS="$CFLAGS -mcpu=604" if test $altivec = "yes"; then - echo "WARNING: tuning for PPC604 but altivec enabled !"; + echo "WARNING: Tuning for PPC604 but AltiVec enabled!"; fi TUNECPU=ppc604 ;; G3|g3|75*|ppc75*|PowerPC75*) CFLAGS="$CFLAGS -mcpu=750 -mtune=750 -mpowerpc-gfxopt" if test $altivec = "yes"; then - echo "WARNING: tuning for PPC75x but altivec enabled !"; + echo "WARNING: Tuning for PPC75x but AltiVec enabled!"; fi TUNECPU=ppc750 ;; G4|g4|745*|ppc745*|PowerPC745*) CFLAGS="$CFLAGS -mcpu=7450 -mtune=7450 -mpowerpc-gfxopt" if test $altivec = "no"; then - echo "WARNING: tuning for PPC745x but altivec disabled !"; + echo "WARNING: Tuning for PPC745x but AltiVec disabled!"; fi TUNECPU=ppc7450 ;; 74*|ppc74*|PowerPC74*) CFLAGS="$CFLAGS -mcpu=7400 -mtune=7400 -mpowerpc-gfxopt" if test $altivec = "no"; then - echo "WARNING: tuning for PPC74xx but altivec disabled !"; + echo "WARNING: Tuning for PPC74xx but AltiVec disabled!"; fi TUNECPU=ppc7400 ;; G5|g5|970|ppc970|PowerPC970|power4*|Power4*) CFLAGS="$CFLAGS -mcpu=970 -mtune=970 -mpowerpc-gfxopt -mpowerpc64" if test $altivec = "no"; then - echo "WARNING: tuning for PPC970 but altivec disabled !"; + echo "WARNING: Tuning for PPC970 but AltiVec disabled!"; fi TUNECPU=ppc970 POWERPCMODE="64bits" @@ -740,7 +745,7 @@ CFLAGS="$CFLAGS -march=$tune" ;; *) - echo "WARNING: unknown CPU \"$tune\", ignored" + echo "WARNING: Unknown CPU \"$tune\", ignored." ;; esac fi @@ -756,7 +761,7 @@ fi fi -# See if we have <altivec.h> +# check if we have <altivec.h> cat > $TMPC << EOF #include <altivec.h> int main( void ) { return 0; } @@ -767,7 +772,7 @@ _altivec_h="yes" fi -# See does our compiler support Motorola AltiVec C API +# check if our compiler supports Motorola AltiVec C API if test $altivec = "yes"; then if test $_altivec_h = "yes"; then cat > $TMPC << EOF @@ -790,7 +795,7 @@ $cc $CFLAGS -o $TMPE $TMPC 2> /dev/null || altivec="no" fi -# Can only do mmi on mips +# mmi only available on mips if test $mmi = "default"; then if test $cpu = "mips"; then mmi="yes" @@ -799,7 +804,7 @@ fi fi -# See does our compiler support mmi +# check if our compiler supports mmi if test $mmi = "yes"; then cat > $TMPC << EOF int main(void) { @@ -833,7 +838,7 @@ if test -z "$cross_prefix" ; then # --- -# big/little endian test +# big/little-endian test cat > $TMPC << EOF #include <inttypes.h> int main(int argc, char ** argv){ @@ -850,7 +855,7 @@ else -# if cross compiling, cannot launch a program, so make a static guess +# programs cannot be launched if cross compiling, so make a static guess if test "$cpu" = "powerpc" -o "$cpu" = "mips" ; then bigendian="yes" fi @@ -907,7 +912,7 @@ fi if test "$_memalign" = "no" -a "$mmx" = "yes" -a "$memalignhack" != "yes"; then - echo "error, no memalign() but sse enabled, either disable it or use --enable-memalign-hack" + echo "Error, no memalign() but SSE enabled, disable it or use --enable-memalign-hack." exit 1 fi @@ -1027,7 +1032,7 @@ ########################################## -# imlib probe +# imlib check cat > $TMPC << EOF #include <X11/Xlib.h> @@ -1041,7 +1046,7 @@ fi ########################################## -# freetype probe +# FreeType check cat > $TMPC << EOF #include <ft2build.h> @@ -1058,7 +1063,7 @@ fi ########################################## -# SDL probe +# SDL check cat > $TMPC << EOF #include <SDL.h> @@ -1080,7 +1085,7 @@ fi ########################################## -# texi2html probe +# texi2html check texi2html=no if (texi2html -version) >/dev/null 2>&1; then @@ -1089,7 +1094,7 @@ if test "$network" = "yes" ; then ########################################## -# IPv6 probe +# IPv6 check cat > $TMPC << EOF #include <sys/types.h> @@ -1163,15 +1168,15 @@ mandir="${prefix}/man" fi -echo "Install prefix $prefix" -echo "Source path $source_path" +echo "install prefix $prefix" +echo "source path $source_path" echo "C compiler $cc" echo "make $make" echo "CPU $cpu ($tune)" if test "$BUILDSUF" != ""; then -echo "Build suffix $BUILDSUF" +echo "build suffix $BUILDSUF" fi -echo "Big Endian $bigendian" +echo "big-endian $bigendian" echo "inttypes.h $inttypes" echo "broken inttypes.h $emu_fast_int" if test $cpu = "x86" -o $cpu = "x86_64"; then @@ -1192,30 +1197,30 @@ echo "libgsm enabled $libgsm" echo "mp3lame enabled $mp3lame" echo "libogg enabled $libogg" -echo "vorbis enabled $vorbis" -echo "theora enabled $theora" -echo "faad enabled $faad" +echo "Vorbis enabled $vorbis" +echo "Theora enabled $theora" +echo "FAAD enabled $faad" echo "faadbin enabled $faadbin" -echo "faac enabled $faac" -echo "xvid enabled $xvid" +echo "FAAC enabled $faac" +echo "XviD enabled $xvid" echo "x264 enabled $x264" echo "a52 support $a52" echo "a52 dlopened $a52bin" -echo "dts support $dts" +echo "DTS support $dts" echo "pp support $pp" echo "debug symbols $debug" echo "strip symbols $dostrip" echo "optimize $optimize" echo "shared pp $shared_pp" -echo "Video hooking $vhook" +echo "video hooking $vhook" echo "SDL support $sdl" if test $sdl_too_old = "yes"; then -echo "-> Your SDL version is too old - please upgrade to have FFplay/SDL support" +echo "-> Your SDL version is too old - please upgrade to have FFplay/SDL support." fi if test "$vhook" = "yes" ; then echo "Imlib2 support $imlib2" -echo "freetype support $freetype2" +echo "FreeType support $freetype2" fi echo "Sun medialib support" $sunmlib echo "pthreads support" $pthreads @@ -1233,12 +1238,12 @@ echo "License: GPL" fi -echo "Creating config.mak and config.h" +echo "Creating config.mak and config.h..." date >> config.log echo " $0 $FFMPEG_CONFIGURATION" >> config.log -echo "# Automatically generated by configure - do not modify" > config.mak -echo "/* Automatically generated by configure - do not modify */" > $TMPH +echo "# Automatically generated by configure - do not modify!" > config.mak +echo "/* Automatically generated by configure - do not modify! */" > $TMPH echo "#define FFMPEG_CONFIGURATION "'"'"$FFMPEG_CONFIGURATION"'"' >> $TMPH echo "prefix=$prefix" >> config.mak @@ -1257,7 +1262,7 @@ echo "INSTALLSTRIP=" >> config.mak fi -# SHCFLAGS is a copy of CFLAGS without -mdynamic-no-pic. Used when building +# SHCFLAGS is a copy of CFLAGS without -mdynamic-no-pic, used when building # shared modules on OS/X (vhook/Makefile). SHCFLAGS=$CFLAGS if test "$needmdynamicnopic" = yes; then @@ -1404,11 +1409,11 @@ version=`grep '#define FFMPEG_VERSION ' "$source_path/libavcodec/avcodec.h" | cut -d '"' -f 2` echo "VERSION=$version" >>config.mak -# if you do not want to use encoders, disable that. +# If you do not want to use encoders, disable them. echo "#define CONFIG_ENCODERS 1" >> $TMPH echo "CONFIG_ENCODERS=yes" >> config.mak -# if you do not want to use decoders, disable that. +# If you do not want to use decoders, disable them. echo "#define CONFIG_DECODERS 1" >> $TMPH echo "CONFIG_DECODERS=yes" >> config.mak @@ -1452,7 +1457,7 @@ fi fi -# mpeg audio high precision mode +# MPEG audio high precision mode if test "$mpegaudio_hp" = "yes" ; then echo "#define CONFIG_MPEGAUDIO_HP 1" >> $TMPH fi @@ -1735,7 +1740,7 @@ rm -f $TMPO $TMPC $TMPE $TMPS $TMPH -# build pkg-config files libavcodec.pc, libavformat.pc and libpostproc.pc +# build pkg-config files libav*.pc and libpostproc.pc lavc_version=`grep '#define LIBAVCODEC_VERSION ' "$source_path/libavcodec/avcodec.h" | sed 's/[^0-9\.]//g'` lavf_version=`grep '#define LIBAVFORMAT_VERSION ' "$source_path/libavformat/avformat.h" | sed 's/[^0-9\.]//g'` lavu_version=`grep '#define LIBAVUTIL_VERSION ' "$source_path/libavutil/avutil.h" | sed 's/[^0-9\.]//g'`

1 0

CVS: ffmpeg/libavformat allformats.c, 1.49, 1.50 asf-enc.c, 1.72, 1.73 asf.c, 1.84, 1.85 au.c, 1.21, 1.22 avienc.c, 1.111, 1.112 avio.c, 1.14, 1.15 aviobuf.c, 1.30, 1.31 ffm.c, 1.44, 1.45 jpeg.c, 1.14, 1.15 mmf.c, 1.3, 1.4 mp3.c, 1.10, 1.11 mpeg.c, 1.88, 1.89 mpegts.c, 1.32, 1.33 mpjpeg.c, 1.6, 1.7 nut.c, 1.55, 1.56 ogg.c, 1.25, 1.26 ogg2.c, 1.9, 1.10 raw.c, 1.57, 1.58 rm.c, 1.48, 1.49 sgi.c, 1.4, 1.5 swf.c, 1.28, 1.29 wav.c, 1.54, 1.55 yuv4mpeg.c, 1.25, 1.26
by diego＠mplayerhq.hu 23 Sep '05

23 Sep '05

Update of /cvsroot/ffmpeg/ffmpeg/libavformat In directory mail:/var2/tmp/cvs-serv19763/libavformat Modified Files: allformats.c asf-enc.c asf.c au.c avienc.c avio.c aviobuf.c ffm.c jpeg.c mmf.c mp3.c mpeg.c mpegts.c mpjpeg.c nut.c ogg.c ogg2.c raw.c rm.c sgi.c swf.c wav.c yuv4mpeg.c Log Message: 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. Index: allformats.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/allformats.c,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- allformats.c 2 Sep 2005 19:18:59 -0000 1.49 +++ allformats.c 23 Sep 2005 00:25:41 -0000 1.50 @@ -37,36 +37,36 @@ 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 @@ 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 @@ #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); Index: asf-enc.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/asf-enc.c,v retrieving revision 1.72 retrieving revision 1.73 diff -u -d -r1.72 -r1.73 --- asf-enc.c 17 Jul 2005 22:24:35 -0000 1.72 +++ asf-enc.c 23 Sep 2005 00:25:41 -0000 1.73 @@ -23,7 +23,7 @@ #undef NDEBUG #include <assert.h> -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS #define ASF_INDEXED_INTERVAL 10000000 @@ -858,4 +858,4 @@ asf_write_trailer, .flags = AVFMT_GLOBALHEADER, }; -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS Index: asf.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/asf.c,v retrieving revision 1.84 retrieving revision 1.85 diff -u -d -r1.84 -r1.85 --- asf.c 10 Aug 2005 23:41:20 -0000 1.84 +++ asf.c 23 Sep 2005 00:25:41 -0000 1.85 @@ -792,17 +792,17 @@ 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; } Index: au.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/au.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- au.c 17 Jul 2005 22:24:35 -0000 1.21 +++ au.c 23 Sep 2005 00:25:41 -0000 1.22 @@ -39,7 +39,7 @@ { 0, 0 }, }; -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS /* AUDIO_FILE header */ static int put_au_header(ByteIOContext *pb, AVCodecContext *enc) { @@ -97,7 +97,7 @@ return 0; } -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS static int au_probe(AVProbeData *p) { @@ -188,7 +188,7 @@ pcm_read_seek, }; -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS static AVOutputFormat au_oformat = { "au", "SUN AU Format", @@ -201,13 +201,13 @@ 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; } Index: avienc.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/avienc.c,v retrieving revision 1.111 retrieving revision 1.112 diff -u -d -r1.111 -r1.112 --- avienc.c 6 Sep 2005 15:02:43 -0000 1.111 +++ avienc.c 23 Sep 2005 00:25:41 -0000 1.112 @@ -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 @@ 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 @@ 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 @@ av_register_output_format(&avi_oformat); return 0; } -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS Index: avio.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/avio.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- avio.c 19 Jun 2004 03:59:34 -0000 1.14 +++ avio.c 23 Sep 2005 00:25:41 -0000 1.15 @@ -100,7 +100,7 @@ return ret; } -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS 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_ENCODERS +#endif //CONFIG_MUXERS offset_t url_seek(URLContext *h, offset_t pos, int whence) { Index: aviobuf.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/aviobuf.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- aviobuf.c 19 Jul 2005 14:50:22 -0000 1.30 +++ aviobuf.c 23 Sep 2005 00:25:41 -0000 1.31 @@ -54,7 +54,7 @@ } -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS static void flush_buffer(ByteIOContext *s) { if (s->buf_ptr > s->buffer) { @@ -104,7 +104,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ put_byte(s, *tag++); } } -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS /* Input stream */ @@ -463,7 +463,7 @@ /* 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 @@ } #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 @@ 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 @@ 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 @@ 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 @@ av_free(d); return size; } -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS Index: ffm.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/ffm.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- ffm.c 19 Jul 2005 14:50:22 -0000 1.44 +++ ffm.c 23 Sep 2005 00:25:41 -0000 1.45 @@ -56,7 +56,7 @@ /* 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 @@ return 0; } -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS /* ffm demux */ @@ -763,7 +763,7 @@ ffm_seek, }; -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS static AVOutputFormat ffm_oformat = { "ffm", "ffm format", @@ -777,13 +777,13 @@ 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; } Index: jpeg.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/jpeg.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- jpeg.c 26 Nov 2003 20:57:15 -0000 1.14 +++ jpeg.c 23 Sep 2005 00:25:41 -0000 1.15 @@ -160,7 +160,7 @@ return jctx.ret_code; } -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS static int jpeg_write(ByteIOContext *pb, AVImageInfo *info) { AVCodecContext *c; @@ -222,7 +222,7 @@ av_free(c); return ret; } -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS AVImageFormat jpeg_image_format = { "jpeg", @@ -230,9 +230,9 @@ 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 }; Index: mmf.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/mmf.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- mmf.c 20 Sep 2005 23:52:29 -0000 1.3 +++ mmf.c 23 Sep 2005 00:25:41 -0000 1.4 @@ -24,7 +24,7 @@ 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 @@ } return 0; } -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS static int mmf_probe(AVProbeData *p) { @@ -308,7 +308,7 @@ mmf_read_seek, }; -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS static AVOutputFormat mmf_oformat = { "mmf", "mmf format", @@ -321,14 +321,14 @@ 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; } Index: mp3.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/mp3.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- mp3.c 17 Jul 2005 22:24:35 -0000 1.10 +++ mp3.c 23 Sep 2005 00:25:41 -0000 1.11 @@ -314,7 +314,7 @@ return 0; } -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS /* simple formats */ static int mp3_write_header(struct AVFormatContext *s) { @@ -340,7 +340,7 @@ } return 0; } -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS AVInputFormat mp3_iformat = { "mp3", @@ -353,7 +353,7 @@ .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 @@ 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; } Index: mpeg.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/mpeg.c,v retrieving revision 1.88 retrieving revision 1.89 diff -u -d -r1.88 -r1.89 --- mpeg.c 17 Jul 2005 22:24:35 -0000 1.88 +++ mpeg.c 23 Sep 2005 00:25:41 -0000 1.89 @@ -107,7 +107,7 @@ 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 @@ } return 0; } -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS /*********************************************/ /* demux code */ @@ -1707,7 +1707,7 @@ return dts; } -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS static AVOutputFormat mpeg1system_mux = { "mpeg", "MPEG1 System format", @@ -1775,7 +1775,7 @@ mpeg_mux_end, }; -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS AVInputFormat mpegps_demux = { "mpeg", @@ -1792,13 +1792,13 @@ 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; } Index: mpegts.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/mpegts.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- mpegts.c 6 Sep 2005 21:25:35 -0000 1.32 +++ mpegts.c 23 Sep 2005 00:25:41 -0000 1.33 @@ -1498,7 +1498,7 @@ 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; Index: mpjpeg.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/mpjpeg.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- mpjpeg.c 10 Jul 2005 10:28:59 -0000 1.6 +++ mpjpeg.c 23 Sep 2005 00:25:41 -0000 1.7 @@ -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 @@ av_register_output_format(&mpjpeg_format); return 0; } -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS Index: nut.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/nut.c,v retrieving revision 1.55 retrieving revision 1.56 diff -u -d -r1.55 -r1.56 --- nut.c 11 Sep 2005 08:32:25 -0000 1.55 +++ nut.c 23 Sep 2005 00:25:41 -0000 1.56 @@ -394,7 +394,7 @@ } } -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS static void put_v(ByteIOContext *bc, uint64_t val) { @@ -843,7 +843,7 @@ return 0; } -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS static int nut_probe(AVProbeData *p) { @@ -1430,7 +1430,7 @@ .extensions = "nut", }; -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS static AVOutputFormat nut_oformat = { "nut", "nut format", @@ -1450,13 +1450,13 @@ 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; } Index: ogg.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/ogg.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- ogg.c 21 Sep 2005 23:09:16 -0000 1.25 +++ ogg.c 23 Sep 2005 00:25:41 -0000 1.26 @@ -29,7 +29,7 @@ } OggContext ; -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS static int ogg_write_header(AVFormatContext *avfcontext) { OggContext *context = avfcontext->priv_data; @@ -149,7 +149,7 @@ 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 @@ #endif int libogg_init(void) { -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS av_register_output_format(&ogg_oformat) ; #endif /* av_register_input_format(&ogg_iformat); */ Index: ogg2.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/ogg2.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- ogg2.c 17 Jul 2005 22:24:36 -0000 1.9 +++ ogg2.c 23 Sep 2005 00:25:41 -0000 1.10 @@ -44,7 +44,7 @@ NULL }; -#if 0 // CONFIG_ENCODERS +#if 0 // CONFIG_MUXERS static int ogg_write_header (AVFormatContext * avfcontext) { @@ -74,7 +74,7 @@ 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 @@ 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); Index: raw.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/raw.c,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- raw.c 17 Jul 2005 22:24:36 -0000 1.57 +++ raw.c 23 Sep 2005 00:25:41 -0000 1.58 @@ -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 @@ { return 0; } -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS /* raw input */ static int raw_read_header(AVFormatContext *s, AVFormatParameters *ap) @@ -329,7 +329,7 @@ .extensions = "ac3", }; -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS AVOutputFormat ac3_oformat = { "ac3", "raw ac3", @@ -342,7 +342,7 @@ raw_write_packet, raw_write_trailer, }; -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS AVInputFormat dts_iformat = { "dts", @@ -367,7 +367,7 @@ .value = CODEC_ID_H261, }; -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS AVOutputFormat h261_oformat = { "h261", "raw h261", @@ -380,7 +380,7 @@ raw_write_packet, raw_write_trailer, }; -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS AVInputFormat h263_iformat = { "h263", @@ -394,7 +394,7 @@ .value = CODEC_ID_H263, }; -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS AVOutputFormat h263_oformat = { "h263", "raw h263", @@ -407,7 +407,7 @@ raw_write_packet, raw_write_trailer, }; -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS AVInputFormat m4v_iformat = { "m4v", @@ -421,7 +421,7 @@ .value = CODEC_ID_MPEG4, }; -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS AVOutputFormat m4v_oformat = { "m4v", "raw MPEG4 video format", @@ -434,7 +434,7 @@ raw_write_packet, raw_write_trailer, }; -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS AVInputFormat h264_iformat = { "h264", @@ -448,7 +448,7 @@ .value = CODEC_ID_H264, }; -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS AVOutputFormat h264_oformat = { "h264", "raw H264 video format", @@ -461,7 +461,7 @@ raw_write_packet, raw_write_trailer, }; -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS AVInputFormat mpegvideo_iformat = { "mpegvideo", @@ -474,7 +474,7 @@ .value = CODEC_ID_MPEG1VIDEO, }; -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS AVOutputFormat mpeg1video_oformat = { "mpeg1video", "MPEG video", @@ -487,9 +487,9 @@ 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 @@ raw_write_packet, raw_write_trailer, }; -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS AVInputFormat mjpeg_iformat = { "mjpeg", @@ -516,7 +516,7 @@ .value = CODEC_ID_MJPEG, }; -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS AVOutputFormat mjpeg_oformat = { "mjpeg", "MJPEG video", @@ -529,7 +529,7 @@ raw_write_packet, raw_write_trailer, }; -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS /* pcm formats */ @@ -547,7 +547,7 @@ .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 @@ raw_write_packet,\ raw_write_trailer,\ }; -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS #ifdef WORDS_BIGENDIAN #define BE_DEF(s) s @@ -638,7 +638,7 @@ .value = CODEC_ID_RAWVIDEO, }; -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS AVOutputFormat rawvideo_oformat = { "rawvideo", "raw video format", @@ -651,9 +651,9 @@ 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 @@ 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 Index: rm.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/rm.c,v retrieving revision 1.48 retrieving revision 1.49 diff -u -d -r1.48 -r1.49 --- rm.c 17 Jul 2005 22:24:36 -0000 1.48 +++ rm.c 23 Sep 2005 00:25:41 -0000 1.49 @@ -44,7 +44,7 @@ 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 @@ put_flush_packet(pb); return 0; } -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS /***************************************************/ @@ -969,7 +969,7 @@ rm_read_dts, }; -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS static AVOutputFormat rm_oformat = { "rm", "rm format", @@ -982,13 +982,13 @@ 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; } Index: sgi.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/sgi.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- sgi.c 8 Jan 2005 14:21:33 -0000 1.4 +++ sgi.c 23 Sep 2005 00:25:41 -0000 1.5 @@ -260,7 +260,7 @@ 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 @@ return 0; } -#endif // CONFIG_ENCODERS +#endif // CONFIG_MUXERS AVImageFormat sgi_image_format = { "sgi", @@ -450,9 +450,9 @@ 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 }; Index: swf.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/swf.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- swf.c 17 Jul 2005 22:24:36 -0000 1.28 +++ swf.c 23 Sep 2005 00:25:41 -0000 1.29 @@ -148,7 +148,7 @@ 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 @@ return 0; } -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS /*********************************************/ /* Extract FLV encoded frame and MP3 from swf @@ -909,7 +909,7 @@ swf_read_close, }; -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS static AVOutputFormat swf_oformat = { "swf", "Flash format", @@ -922,13 +922,13 @@ 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; } Index: wav.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/wav.c,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- wav.c 2 Sep 2005 19:16:48 -0000 1.54 +++ wav.c 23 Sep 2005 00:25:41 -0000 1.55 @@ -46,7 +46,7 @@ { 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 @@ 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 @@ return id; } -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS typedef struct { offset_t data; } WAVContext; @@ -253,7 +253,7 @@ } return 0; } -#endif //CONFIG_ENCODERS +#endif //CONFIG_MUXERS /* return the size of the found tag */ /* XXX: > 2GB ? */ @@ -395,7 +395,7 @@ wav_read_seek, }; -#ifdef CONFIG_ENCODERS +#ifdef CONFIG_MUXERS static AVOutputFormat wav_oformat = { "wav", "wav format", @@ -408,13 +408,13 @@ 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; } Index: yuv4mpeg.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/yuv4mpeg.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- yuv4mpeg.c 14 Aug 2005 15:42:40 -0000 1.25 +++ yuv4mpeg.c 23 Sep 2005 00:25:41 -0000 1.26 @@ -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 @@ 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 @@ 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; }

1 0