Mercurial > mplayer.hg
comparison cfg-common.h @ 17107:1223e30c8f9e
100l, reverting unrelated change with last commit
| author | ods15 |
|---|---|
| date | Tue, 06 Dec 2005 08:45:06 +0000 |
| parents | 05af35012e4f |
| children | 3aea4bdfd0d0 |
comparison
equal
deleted
inserted
replaced
| 17106:05af35012e4f | 17107:1223e30c8f9e |
|---|---|
| 223 #endif | 223 #endif |
| 224 #if defined(HAVE_XVID3) || defined(HAVE_XVID4) | 224 #if defined(HAVE_XVID3) || defined(HAVE_XVID4) |
| 225 {"xvidopts", xvid_dec_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, | 225 {"xvidopts", xvid_dec_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, |
| 226 #endif | 226 #endif |
| 227 {"codecs-file", &codecs_file, CONF_TYPE_STRING, 0, 0, 0, NULL}, | 227 {"codecs-file", &codecs_file, CONF_TYPE_STRING, 0, 0, 0, NULL}, |
| 228 #ifdef WIN32_LOADER | |
| 229 {"codecs-dir", &def_path, CONF_TYPE_STRING, 0, 0, 0, NULL}, | |
| 230 #endif | |
| 231 | |
| 232 // ------------------------- subtitles options -------------------- | 228 // ------------------------- subtitles options -------------------- |
| 233 | 229 |
| 234 #ifdef USE_SUB | 230 #ifdef USE_SUB |
| 235 {"sub", &sub_name, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL}, | 231 {"sub", &sub_name, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL}, |
| 236 #ifdef USE_FRIBIDI | 232 #ifdef USE_FRIBIDI |
| 311 extern int vd_use_slices; | 307 extern int vd_use_slices; |
| 312 extern int divx_quality; | 308 extern int divx_quality; |
| 313 | 309 |
| 314 /* defined in codec-cfg.c */ | 310 /* defined in codec-cfg.c */ |
| 315 extern char * codecs_file; | 311 extern char * codecs_file; |
| 316 | |
| 317 #ifdef WIN32_LOADER | |
| 318 extern char * def_path; | |
| 319 #endif | |
| 320 | 312 |
| 321 /* from dec_audio, currently used for ac3surround decoder only */ | 313 /* from dec_audio, currently used for ac3surround decoder only */ |
| 322 extern int audio_output_channels; | 314 extern int audio_output_channels; |
| 323 | 315 |
| 324 #ifdef MPLAYER_NETWORK | 316 #ifdef MPLAYER_NETWORK |