[MPlayer-cvslog] CVS: main/libmpdemux Makefile, 1.86, 1.87 muxer.h, 1.12, 1.13 muxer.c, 1.6, 1.7

[Nico Sabbi CVS]

CVS change done by Nico Sabbi CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv26607/libmpdemux

Modified Files:
	Makefile muxer.h muxer.c 
Log Message:
initial, extremely experimental, libavformat muxer; don't expect anything to work yet

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/Makefile,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- Makefile	13 Feb 2005 13:39:19 -0000	1.86
+++ Makefile	21 Feb 2005 23:18:31 -0000	1.87
@@ -31,6 +31,7 @@
 
 ifeq ($(CONFIG_LIBAVFORMAT),yes)
 LIBAV_INC = -I../libavcodec -I../libavformat
+SRCS += muxer_lavf.c
 endif
 
 OBJS	= $(SRCS:.c=.o)

Index: muxer.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/muxer.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- muxer.h	21 Feb 2005 21:45:49 -0000	1.12
+++ muxer.h	21 Feb 2005 23:18:31 -0000	1.13
@@ -7,6 +7,7 @@
 #define MUXER_TYPE_AVI 0
 #define MUXER_TYPE_MPEG 1
 #define MUXER_TYPE_RAWVIDEO 2
+#define MUXER_TYPE_LAVF 3
 
 
 typedef struct {

Index: muxer.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/muxer.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- muxer.c	21 Feb 2005 21:45:49 -0000	1.6
+++ muxer.c	21 Feb 2005 23:18:31 -0000	1.7
@@ -31,6 +31,12 @@
         if(! muxer_init_muxer_rawvideo(muxer))
 	  return NULL;
 	break;
+#ifdef USE_LIBAVFORMAT
+      case MUXER_TYPE_LAVF:
+        if(! muxer_init_muxer_lavf(muxer))
+	  return NULL;
+        break;
+#endif
       case MUXER_TYPE_AVI:
       default:
 	if(! muxer_init_muxer_avi(muxer))