From 64ab68dc1d51e3cb7e0b1c1b2687aaea79e4c737 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 4 Mar 2008 19:30:35 +0000
Subject: Simplify preprocessor conditionals: USE_LIBAV* is defined when
 compiling against both shared and static libraries.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26157 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 cfg-common.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'cfg-common.h')

diff --git a/cfg-common.h b/cfg-common.h
index 0989402dfa..e5d02cd88c 100644
--- a/cfg-common.h
+++ b/cfg-common.h
@@ -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)
-- 
cgit v1.2.3