diff options
author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-12-23 00:33:22 +0000 |
---|---|---|
committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-12-23 00:33:22 +0000 |
commit | 7f1c5834473c4041337e30f5e606aca629498aa7 (patch) | |
tree | e4d54c5ec378c502d6f8ffe19c068c8295ee5735 /cfg-mplayer.h | |
parent | da027164877a7a8c2288256145ee16c7878c36b2 (diff) | |
download | mpv-7f1c5834473c4041337e30f5e606aca629498aa7.tar.bz2 mpv-7f1c5834473c4041337e30f5e606aca629498aa7.tar.xz |
Merged EDL 0.5 patch - it's something like Quicktime's edit lists.
(skip sections listed in a text file. it also supports creating them)
patch by Michael Halcrow <mah69@email.byu.edu>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8532 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'cfg-mplayer.h')
-rw-r--r-- | cfg-mplayer.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h index 7fd9c672d4..859dc48955 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -203,6 +203,13 @@ static config_t mplayer_opts[]={ CONF_TYPE_PRINT, 0, 0, 0, NULL}, {"noalsa", "Option -noalsa has been removed, new audio code doesn't need it! Remove it from your config file!\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, +#ifdef USE_EDL + {"edl", &edl_filename, CONF_TYPE_STRING, 0, 0, 0, NULL}, + {"edlout", &edl_output_filename, CONF_TYPE_STRING, 0, 0, 0, NULL}, +#else + {"edl", "MPlayer was compiled without EDL support\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, + {"edlout", "MPlayer was compiled without EDL support\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, +#endif #ifdef HAVE_X11 {"display", &mDisplayName, CONF_TYPE_STRING, 0, 0, 0, NULL}, |