comparison cfg-common.h @ 26125:020e58ad1408

Simplify preprocessor conditionals: USE_LIBAV* is defined when compiling against both shared and static libraries.
author diego
date Tue, 04 Mar 2008 19:30:35 +0000
parents 0d369275fb20
children 4d7f8b0bebe7
comparison
equal deleted inserted replaced
26124:57b8407b9047 26125:020e58ad1408
218 218
219 // postprocessing: 219 // postprocessing:
220 #ifdef USE_LIBAVCODEC 220 #ifdef USE_LIBAVCODEC
221 {"pp", &divx_quality, CONF_TYPE_INT, 0, 0, 0, NULL}, 221 {"pp", &divx_quality, CONF_TYPE_INT, 0, 0, 0, NULL},
222 #endif 222 #endif
223 #if defined(USE_LIBPOSTPROC) || defined(USE_LIBPOSTPROC_SO) 223 #ifdef USE_LIBPOSTPROC
224 {"pphelp", &pp_help, CONF_TYPE_PRINT_INDIRECT, CONF_NOCFG, 0, 0, NULL}, 224 {"pphelp", &pp_help, CONF_TYPE_PRINT_INDIRECT, CONF_NOCFG, 0, 0, NULL},
225 #endif 225 #endif
226 226
227 // scaling: 227 // scaling:
228 {"sws", &sws_flags, CONF_TYPE_INT, 0, 0, 2, NULL}, 228 {"sws", &sws_flags, CONF_TYPE_INT, 0, 0, 2, NULL},
249 {"field-dominance", &field_dominance, CONF_TYPE_INT, CONF_RANGE, -1, 1, NULL}, 249 {"field-dominance", &field_dominance, CONF_TYPE_INT, CONF_RANGE, -1, 1, NULL},
250 250
251 #ifdef USE_LIBAVCODEC 251 #ifdef USE_LIBAVCODEC
252 {"lavdopts", lavc_decode_opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, 252 {"lavdopts", lavc_decode_opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
253 #endif 253 #endif
254 #if defined(USE_LIBAVFORMAT) || defined(USE_LIBAVFORMAT_SO) 254 #ifdef USE_LIBAVFORMAT
255 {"lavfdopts", lavfdopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, 255 {"lavfdopts", lavfdopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
256 #endif 256 #endif
257 #if defined(HAVE_XVID3) || defined(HAVE_XVID4) 257 #if defined(HAVE_XVID3) || defined(HAVE_XVID4)
258 {"xvidopts", xvid_dec_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, 258 {"xvidopts", xvid_dec_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
259 #endif 259 #endif