[Mplayer-cvslog] CVS: main cfg-common.h, 1.128, 1.129 cfg-mencoder.h, 1.80, 1.81

[Tobias Diedrich CVS]

CVS change done by Tobias Diedrich CVS

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

Modified Files:
	cfg-common.h cfg-mencoder.h 
Log Message:
Better vprp aspect fix

Index: cfg-common.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-common.h,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- cfg-common.h	5 Feb 2004 17:08:55 -0000	1.128
+++ cfg-common.h	22 Mar 2004 01:42:43 -0000	1.129
@@ -119,6 +119,8 @@
 	{"dvbin", dvbin_opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
 #endif
 
+	{"useaviaspect", &avi_use_vprp_aspect, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+	{"nouseaviaspect", &avi_use_vprp_aspect, CONF_TYPE_FLAG, 0, 1, 0, NULL},
 
 // ------------------------- a-v sync options --------------------
 
@@ -317,6 +319,8 @@
 extern int ts_keep_broken;
 extern off_t ts_probe;
 
+extern int avi_use_vprp_aspect; /* defined in aviheader.c */
+
 #include "libmpdemux/tv.h"
 
 #ifdef USE_EDL

Index: cfg-mencoder.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- cfg-mencoder.h	21 Mar 2004 21:32:53 -0000	1.80
+++ cfg-mencoder.h	22 Mar 2004 01:42:43 -0000	1.81
@@ -58,8 +58,6 @@
 extern m_option_t xvidencopts_conf[];
 #endif
 
-extern float avi_prp_aspect;
-
 extern m_option_t nuvopts_conf[];
 
 m_option_t ovc_conf[]={
@@ -194,9 +192,6 @@
 	// override FOURCC in output file
 	{"ffourcc", &force_fourcc, CONF_TYPE_STRING, 0, 4, 4, NULL},
 
-	// avi muxer - include prp header with aspect ratio
-	{"aviaspect", &avi_prp_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.2, 3.0, NULL},
-
 	{"pass", "The -pass option is obsolete. Use -lavcopts vpass=n or -divx4opts pass=n!\nRTFM!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 	{"passlogfile", &passtmpfile, CONF_TYPE_STRING, 0, 0, 0, NULL},