summaryrefslogtreecommitdiffstats
path: root/cfg-common.h
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-10-31 03:19:56 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-11-02 04:16:55 +0200
commitc5e462b33d6db445b1c763e89320b1bcb214debb (patch)
tree5091b402fb3cc768fa5dbc718d5681d3d78d191f /cfg-common.h
parent389c32b5c72897a8b1b3c929c8f278e8980f2290 (diff)
downloadmpv-c5e462b33d6db445b1c763e89320b1bcb214debb.tar.bz2
mpv-c5e462b33d6db445b1c763e89320b1bcb214debb.tar.xz
build: enable/disable all FFmpeg libraries together
Enable all of libavcodec, libavformat, libswscale, and libpostproc together (libavutil is always required). based on svn commit by diego: git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32226 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'cfg-common.h')
-rw-r--r--cfg-common.h10
1 files changed, 3 insertions, 7 deletions
diff --git a/cfg-common.h b/cfg-common.h
index eb0b73ed62..1e9871f99b 100644
--- a/cfg-common.h
+++ b/cfg-common.h
@@ -600,11 +600,9 @@ const m_option_t common_opts[] = {
{"ac", &audio_codec_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
{"vc", &video_codec_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
- // postprocessing:
-#ifdef CONFIG_LIBAVCODEC
+ // postprocessing:
+#ifdef CONFIG_FFMPEG
{"pp", &divx_quality, CONF_TYPE_INT, 0, 0, 0, NULL},
-#endif
-#ifdef CONFIG_LIBPOSTPROC
{"pphelp", &pp_help, CONF_TYPE_PRINT_INDIRECT, CONF_NOCFG, 0, 0, NULL},
#endif
@@ -631,10 +629,8 @@ const m_option_t common_opts[] = {
OPT_FLAG_OFF("noslices", vd_use_slices, 0),
{"field-dominance", &field_dominance, CONF_TYPE_INT, CONF_RANGE, -1, 1, NULL},
-#ifdef CONFIG_LIBAVCODEC
+#ifdef CONFIG_FFMPEG
{"lavdopts", (void *) lavc_decode_opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
-#endif
-#ifdef CONFIG_LIBAVFORMAT
{"lavfdopts", (void *) lavfdopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
#endif
#ifdef CONFIG_XVID4