[MPlayer-cvslog] r33336 - in trunk: DOCS/man/de/mplayer.1 DOCS/man/en/mplayer.1 gui/cfg.c gui/cfg.h

[ib]

Author: ib
Date: Wed Apr 27 16:57:37 2011
New Revision: 33336

Log:
Limit config option vf_lavc to dxr3.

The option isn't used if dxr3 isn't enabled.

Modified:
   trunk/gui/cfg.c
   trunk/gui/cfg.h

Changes in other areas also in this revision:
Modified:
   trunk/DOCS/man/de/mplayer.1
   trunk/DOCS/man/en/mplayer.1

Modified: trunk/gui/cfg.c
==============================================================================
--- trunk/gui/cfg.c	Wed Apr 27 10:40:56 2011	(r33335)
+++ trunk/gui/cfg.c	Wed Apr 27 16:57:37 2011	(r33336)
@@ -42,10 +42,10 @@
 int gtkCacheOn;
 int gtkCacheSize = 2048;
 
-int gtkVfLAVC;
 int gtkVfPP;
 
 #ifdef CONFIG_DXR3
+int gtkVfLAVC;
 char *gtkDXR3Device;
 #endif
 
@@ -102,10 +102,10 @@ static const m_option_t gui_opts[] = {
     { "cache",                       &gtkCacheOn,              CONF_TYPE_FLAG,        0,          0,     1,       NULL },
     { "cache_size",                  &gtkCacheSize,            CONF_TYPE_INT,         CONF_RANGE, 32,    1048576, NULL },
 
-    { "vf_lavc",                     &gtkVfLAVC,               CONF_TYPE_FLAG,        0,          0,     1,       NULL },
     { "vf_pp",                       &gtkVfPP,                 CONF_TYPE_FLAG,        0,          0,     1,       NULL },
 
 #ifdef CONFIG_DXR3
+    { "vf_lavc",                     &gtkVfLAVC,               CONF_TYPE_FLAG,        0,          0,     1,       NULL },
     { "vo_dxr3_device",              &gtkDXR3Device,           CONF_TYPE_STRING,      0,          0,     0,       NULL },
 #endif
 

Modified: trunk/gui/cfg.h
==============================================================================
--- trunk/gui/cfg.h	Wed Apr 27 10:40:56 2011	(r33335)
+++ trunk/gui/cfg.h	Wed Apr 27 16:57:37 2011	(r33336)
@@ -24,8 +24,8 @@
 extern int gtkCacheOn;
 extern int gtkCacheSize;
 
-extern int gtkVfLAVC;
 extern int gtkVfPP;
+extern int gtkVfLAVC;
 
 extern char *gtkDXR3Device;