comparison cfg-common-opts.h @ 27362:9020d4c7bd32

Remove checks for HAVE_XVID3, that conditional was removed a long time ago.
author diego
date Sat, 02 Aug 2008 13:59:47 +0000
parents d788e177a35e
children 40057010b1fa
comparison
equal deleted inserted replaced
27361:7cf315c4707f 27362:9020d4c7bd32
255 {"lavdopts", lavc_decode_opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, 255 {"lavdopts", lavc_decode_opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
256 #endif 256 #endif
257 #ifdef CONFIG_LIBAVFORMAT 257 #ifdef CONFIG_LIBAVFORMAT
258 {"lavfdopts", lavfdopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, 258 {"lavfdopts", lavfdopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
259 #endif 259 #endif
260 #if defined(HAVE_XVID3) || defined(HAVE_XVID4) 260 #ifdef HAVE_XVID4
261 {"xvidopts", xvid_dec_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, 261 {"xvidopts", xvid_dec_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
262 #endif 262 #endif
263 {"codecs-file", &codecs_file, CONF_TYPE_STRING, 0, 0, 0, NULL}, 263 {"codecs-file", &codecs_file, CONF_TYPE_STRING, 0, 0, 0, NULL},
264 // ------------------------- subtitles options -------------------- 264 // ------------------------- subtitles options --------------------
265 265