Mercurial > mplayer.hg

changeset 33249:8fc02babf810

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Limit config option vf_lavc to dxr3. The option isn't used if dxr3 isn't enabled.
author ib
date Wed, 27 Apr 2011 14:57:37 +0000
parents 747e5068118c
children b037199baddc
files DOCS/man/de/mplayer.1 DOCS/man/en/mplayer.1 gui/cfg.c gui/cfg.h
diffstat 4 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/DOCS/man/de/mplayer.1	Wed Apr 27 08:40:56 2011 +0000
+++ b/DOCS/man/de/mplayer.1	Wed Apr 27 14:57:37 2011 +0000
@@ -620,7 +620,7 @@
 playbar (aktiviert/deaktiviert),
 show_videowin (ja/nein),
 vf_lavc
-.RB ( "vf lavc" "),"
+.RB ( "vf lavc" ") (nur mit DXR3),"
 vf_pp
 .RB ( "vf pp" "),"
 vo_dxr3_device (unbenutzt) (nur mit DXR3).
--- a/DOCS/man/en/mplayer.1	Wed Apr 27 08:40:56 2011 +0000
+++ b/DOCS/man/en/mplayer.1	Wed Apr 27 14:57:37 2011 +0000
@@ -605,7 +605,7 @@
 playbar (enable/disable),
 show_videowin (yes/no),
 vf_lavc
-.RB ( "vf lavc" "),"
+.RB ( "vf lavc" ") (DXR3 only),"
 vf_pp
 .RB ( "vf pp" "),"
 vo_dxr3_device (unused) (DXR3 only).
--- a/gui/cfg.c	Wed Apr 27 08:40:56 2011 +0000
+++ b/gui/cfg.c	Wed Apr 27 14:57:37 2011 +0000
@@ -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 @@
     { "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
 
--- a/gui/cfg.h	Wed Apr 27 08:40:56 2011 +0000
+++ b/gui/cfg.h	Wed Apr 27 14:57:37 2011 +0000
@@ -24,8 +24,8 @@
 extern int gtkCacheOn;
 extern int gtkCacheSize;
 
+extern int gtkVfPP;
 extern int gtkVfLAVC;
-extern int gtkVfPP;
 
 extern char *gtkDXR3Device;