diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-03-04 19:30:35 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-03-04 19:30:35 +0000 |
| commit | 64ab68dc1d51e3cb7e0b1c1b2687aaea79e4c737 (patch) | |
| tree | bceea5422fe598ec18a288fefcf52b5f922e69f9 | |
| parent | ac491474f1f54457e0d01fb0c0f6fee830bf9707 (diff) | |
| download | mpv-64ab68dc1d51e3cb7e0b1c1b2687aaea79e4c737.tar.bz2 mpv-64ab68dc1d51e3cb7e0b1c1b2687aaea79e4c737.tar.xz | |
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
| -rw-r--r-- | cfg-common.h | 4 | ||||
| -rw-r--r-- | cfg-mencoder.h | 6 |
2 files changed, 5 insertions, 5 deletions
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) diff --git a/cfg-mencoder.h b/cfg-mencoder.h index 8847e0f0d6..e31c08d06c 100644 --- a/cfg-mencoder.h +++ b/cfg-mencoder.h @@ -138,7 +138,7 @@ const m_option_t info_conf[]={ const m_option_t of_conf[]={ {"avi", &out_file_format, CONF_TYPE_FLAG, 0, 0, MUXER_TYPE_AVI, NULL}, {"mpeg", &out_file_format, CONF_TYPE_FLAG, 0, 0, MUXER_TYPE_MPEG, NULL}, -#if defined(USE_LIBAVFORMAT) || defined(USE_LIBAVFORMAT_SO) +#ifdef USE_LIBAVFORMAT {"lavf", &out_file_format, CONF_TYPE_FLAG, 0, 0, MUXER_TYPE_LAVF, NULL}, #endif {"rawvideo", &out_file_format, CONF_TYPE_FLAG, 0, 0, MUXER_TYPE_RAWVIDEO, NULL}, @@ -146,7 +146,7 @@ const m_option_t of_conf[]={ {"help", "\nAvailable output formats:\n" " avi - Microsoft Audio/Video Interleaved\n" " mpeg - MPEG-1/2 system stream format\n" -#if defined(USE_LIBAVFORMAT) || defined(USE_LIBAVFORMAT_SO) +#ifdef USE_LIBAVFORMAT " lavf - FFmpeg libavformat muxers\n" #endif " rawvideo - (video only, one stream only) raw stream, no muxing\n" @@ -254,7 +254,7 @@ const m_option_t mencoder_opts[]={ {"nuvopts", nuvopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, #endif {"mpegopts", mpegopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, -#if defined(USE_LIBAVFORMAT) || defined(USE_LIBAVFORMAT_SO) +#ifdef USE_LIBAVFORMAT {"lavfopts", lavfopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, #endif |