Mercurial > mplayer.hg

diff cfg-common.h @ 26125:020e58ad1408

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplify preprocessor conditionals: USE_LIBAV* is defined when compiling against both shared and static libraries.
author diego
date Tue, 04 Mar 2008 19:30:35 +0000
parents 0d369275fb20
children 4d7f8b0bebe7
line wrap: on
line diff
--- a/cfg-common.h	Tue Mar 04 19:13:18 2008 +0000
+++ b/cfg-common.h	Tue Mar 04 19:30:35 2008 +0000
@@ -220,7 +220,7 @@
 #ifdef USE_LIBAVCODEC
 	{"pp", &divx_quality, CONF_TYPE_INT, 0, 0, 0, NULL},
 #endif
-#if defined(USE_LIBPOSTPROC) || defined(USE_LIBPOSTPROC_SO)
+#ifdef USE_LIBPOSTPROC
         {"pphelp", &pp_help, CONF_TYPE_PRINT_INDIRECT, CONF_NOCFG, 0, 0, NULL},
 #endif
 
@@ -251,7 +251,7 @@
 #ifdef USE_LIBAVCODEC
 	{"lavdopts", lavc_decode_opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
 #endif
-#if defined(USE_LIBAVFORMAT) ||  defined(USE_LIBAVFORMAT_SO)
+#ifdef USE_LIBAVFORMAT
         {"lavfdopts",  lavfdopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
 #endif
 #if defined(HAVE_XVID3) || defined(HAVE_XVID4)