Mercurial > mplayer.hg
comparison cfg-common.h @ 18312:3b5b7e78b9af
Make EDL compilation unconditional
author | uau |
---|---|
date | Thu, 27 Apr 2006 12:40:29 +0000 |
parents | 4231482179b6 |
children | e3939d5e50e1 |
comparison
equal
deleted
inserted
replaced
18311:6727756ba981 | 18312:3b5b7e78b9af |
---|---|
88 | 88 |
89 // seek to byte/seconds position | 89 // seek to byte/seconds position |
90 {"sb", &seek_to_byte, CONF_TYPE_POSITION, CONF_MIN, 0, 0, NULL}, | 90 {"sb", &seek_to_byte, CONF_TYPE_POSITION, CONF_MIN, 0, 0, NULL}, |
91 {"ss", &seek_to_sec, CONF_TYPE_STRING, CONF_MIN, 0, 0, NULL}, | 91 {"ss", &seek_to_sec, CONF_TYPE_STRING, CONF_MIN, 0, 0, NULL}, |
92 | 92 |
93 #ifdef USE_EDL | |
94 {"edl", &edl_filename, CONF_TYPE_STRING, 0, 0, 0, NULL}, | 93 {"edl", &edl_filename, CONF_TYPE_STRING, 0, 0, 0, NULL}, |
95 #else | 94 |
96 {"edl", "MPlayer was compiled without EDL support.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, | |
97 #endif | |
98 // AVI specific: force non-interleaved mode | 95 // AVI specific: force non-interleaved mode |
99 {"ni", &force_ni, CONF_TYPE_FLAG, 0, 0, 1, NULL}, | 96 {"ni", &force_ni, CONF_TYPE_FLAG, 0, 0, 1, NULL}, |
100 {"noni", &force_ni, CONF_TYPE_FLAG, 0, 1, 0, NULL}, | 97 {"noni", &force_ni, CONF_TYPE_FLAG, 0, 1, 0, NULL}, |
101 | 98 |
102 // AVI and Ogg only: (re)build index at startup | 99 // AVI and Ogg only: (re)build index at startup |
359 extern int ts_keep_broken; | 356 extern int ts_keep_broken; |
360 extern off_t ts_probe; | 357 extern off_t ts_probe; |
361 | 358 |
362 #include "libmpdemux/tv.h" | 359 #include "libmpdemux/tv.h" |
363 | 360 |
364 #ifdef USE_EDL | |
365 extern char* edl_filename; | 361 extern char* edl_filename; |
366 extern char* edl_output_filename; | 362 extern char* edl_output_filename; |
367 #endif | |
368 | 363 |
369 #ifdef USE_TV | 364 #ifdef USE_TV |
370 m_option_t tvopts_conf[]={ | 365 m_option_t tvopts_conf[]={ |
371 {"on", "-tv on is deprecated, use tv:// instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, | 366 {"on", "-tv on is deprecated, use tv:// instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, |
372 {"immediatemode", &tv_param_immediate, CONF_TYPE_INT, CONF_RANGE, 0, 1, NULL}, | 367 {"immediatemode", &tv_param_immediate, CONF_TYPE_INT, CONF_RANGE, 0, 1, NULL}, |