diff options
| author | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-04-27 12:40:29 +0000 |
|---|---|---|
| committer | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-04-27 12:40:29 +0000 |
| commit | 8f30963c37732395940f6435b014f5cf45d52434 (patch) | |
| tree | 5519de8aed6939047056c93f9ed5bce432c46f57 /cfg-common.h | |
| parent | 9706c6b61611dba9e2addb5388ed56617ed7d231 (diff) | |
| download | mpv-8f30963c37732395940f6435b014f5cf45d52434.tar.bz2 mpv-8f30963c37732395940f6435b014f5cf45d52434.tar.xz | |
Make EDL compilation unconditional
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18313 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'cfg-common.h')
| -rw-r--r-- | cfg-common.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/cfg-common.h b/cfg-common.h index 4c1fbfcf23..5779157911 100644 --- a/cfg-common.h +++ b/cfg-common.h @@ -90,11 +90,8 @@ {"sb", &seek_to_byte, CONF_TYPE_POSITION, CONF_MIN, 0, 0, NULL}, {"ss", &seek_to_sec, CONF_TYPE_STRING, CONF_MIN, 0, 0, NULL}, -#ifdef USE_EDL {"edl", &edl_filename, CONF_TYPE_STRING, 0, 0, 0, NULL}, -#else - {"edl", "MPlayer was compiled without EDL support.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, -#endif + // AVI specific: force non-interleaved mode {"ni", &force_ni, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"noni", &force_ni, CONF_TYPE_FLAG, 0, 1, 0, NULL}, @@ -361,10 +358,8 @@ extern off_t ts_probe; #include "libmpdemux/tv.h" -#ifdef USE_EDL extern char* edl_filename; extern char* edl_output_filename; -#endif #ifdef USE_TV m_option_t tvopts_conf[]={ |