[Mplayer-cvslog] CVS: main cfg-common.h,1.50,1.51 codec-cfg.c,1.91,1.92 codec-cfg.h,1.60,1.61 configure,1.531,1.532

[Arpi of Ize]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv18912

Modified Files:
	cfg-common.h codec-cfg.c codec-cfg.h configure 
Log Message:
native DV audio/video decoders using libdv
based on patch by Alexander Neundorf <neundorf at kde.org>


Index: cfg-common.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-common.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- cfg-common.h	25 Jul 2002 03:37:27 -0000	1.50
+++ cfg-common.h	5 Aug 2002 17:23:22 -0000	1.51
@@ -104,8 +104,8 @@
 	{"nosound", &has_audio, CONF_TYPE_FLAG, 0, 1, 0, NULL},
 
 	// select audio/video codec (by name) or codec family (by number):
-	{"afm", &audio_family, CONF_TYPE_INT, CONF_MIN, 0, 16, NULL}, // keep ranges in sync
-	{"vfm", &video_family, CONF_TYPE_INT, CONF_MIN, 0, 14, NULL}, // with codec-cfg.c
+	{"afm", &audio_family, CONF_TYPE_INT, CONF_MIN, 0, 22, NULL}, // keep ranges in sync
+	{"vfm", &video_family, CONF_TYPE_INT, CONF_MIN, 0, 29, NULL}, // with codec-cfg.c
 	{"ac", &audio_codec, CONF_TYPE_STRING, 0, 0, 0, NULL},
 	{"vc", &video_codec, CONF_TYPE_STRING, 0, 0, 0, NULL},
 

Index: codec-cfg.c
===================================================================
RCS file: /cvsroot/mplayer/main/codec-cfg.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- codec-cfg.c	1 Aug 2002 12:39:07 -0000	1.91
+++ codec-cfg.c	5 Aug 2002 17:23:22 -0000	1.92
@@ -235,6 +235,7 @@
 		"roqaudio",
 		"faad",
 		"realaud",
+		"libdv",
 		NULL
 	};
 	static char *videodrv[] = {
@@ -267,6 +268,7 @@
 		"realvid",
 		"svq1",
 		"xvid",
+		"libdv",
 		NULL
 	};
         char **drv=audioflag?audiodrv:videodrv;

Index: codec-cfg.h
===================================================================
RCS file: /cvsroot/mplayer/main/codec-cfg.h,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- codec-cfg.h	10 Jul 2002 20:56:50 -0000	1.60
+++ codec-cfg.h	5 Aug 2002 17:23:22 -0000	1.61
@@ -48,6 +48,7 @@
 #define AFM_ROQAUDIO 19
 #define AFM_AAC 20
 #define AFM_REAL 21
+#define AFM_LIBDV 22
 
 #define VFM_MPEG 1
 #define VFM_VFW 2
@@ -77,6 +78,7 @@
 #define VFM_REAL 26
 #define VFM_SVQ1 27
 #define VFM_XVID 28
+#define VFM_LIBDV 29
 
 #ifndef GUID_TYPE
 #define GUID_TYPE

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.531
retrieving revision 1.532
diff -u -r1.531 -r1.532
--- configure	5 Aug 2002 11:42:29 -0000	1.531
+++ configure	5 Aug 2002 17:23:22 -0000	1.532
@@ -4182,9 +4182,9 @@
 DIVX4LINUX = $_divx4linux
 XVID = $_xvid
 XVID_LIB = $_ld_xvid
-DECORE_LIB = $_ld_decore
+DECORE_LIB = $_ld_decore $_ld_libdv
 MENCODER = $_mencoder
-ENCORE_LIB =  $_ld_encore $_ld_mp3lame $_ld_libdv
+ENCORE_LIB =  $_ld_encore $_ld_mp3lame
 DIRECTFB_INC = $_inc_directfb
 DIRECTFB_LIB = $_ld_directfb
 NEW_INPUT_LIB = $_ld_new_input