From c5e462b33d6db445b1c763e89320b1bcb214debb Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Sun, 31 Oct 2010 03:19:56 +0300 Subject: 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 --- cfg-common.h | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'cfg-common.h') 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 -- cgit v1.2.3