diff options
| author | Uoti Urpala <uau@mplayer2.org> | 2012-01-19 06:49:47 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@mplayer2.org> | 2012-03-09 20:48:54 +0200 |
| commit | 7576885677764a71fe03cec5f697f8a28f9365c8 (patch) | |
| tree | e93b5c8469cbfc1ac6fc60684f5564a8f6a95be8 /cfg-mplayer.h | |
| parent | 8a6b0b813a1431ca50986c90d97b72fa6640dbea (diff) | |
| download | mpv-7576885677764a71fe03cec5f697f8a28f9365c8.tar.bz2 mpv-7576885677764a71fe03cec5f697f8a28f9365c8.tar.xz | |
core: remove old EDL mode (--edl option)
Remove the old EDL implementation that was activated with the --edl
option. It is mostly redundant and inferior compared to the newer
demux_edl support, though currently there's no support for using the
same EDL files with the new implementation and the mute functionality
of the old implementation is not supported. The main reason to remove
the old implementation at this point is that the mute functionality
would conflict with following audio volume handling changes, and
working on the old code would be a wasted effort in the long run as at
some point it would be removed anyway.
The --edlout functionality is kept for now, even though after this
commit there is no code that could directly read its output.
Diffstat (limited to 'cfg-mplayer.h')
| -rw-r--r-- | cfg-mplayer.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h index 471e3d8505..2f1ba666bb 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -488,7 +488,8 @@ const m_option_t common_opts[] = { // stop at given position {"endpos", &end_at, CONF_TYPE_TIME_SIZE, 0, 0, 0, NULL}, - {"edl", &edl_filename, CONF_TYPE_STRING, 0, 0, 0, NULL}, + OPT_ERRORMESSAGE("edl", "Old EDL functionality using the --edl option is " + "not supported.\n"), // AVI specific: force non-interleaved mode {"ni", &force_ni, CONF_TYPE_FLAG, 0, 0, 1, NULL}, |