diff options
| author | wm4 <wm4@nowhere> | 2013-02-06 21:41:21 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-02-06 23:03:39 +0100 |
| commit | c5340512dd5a75079779c896505a038caf3ce69a (patch) | |
| tree | dad034fa95de5d1c9f835cf8e1fe5ec0f4592518 /core/mplayer.c | |
| parent | 74817a77d45c96d4107b1946d0f918a893c58cac (diff) | |
| download | mpv-c5340512dd5a75079779c896505a038caf3ce69a.tar.bz2 mpv-c5340512dd5a75079779c896505a038caf3ce69a.tar.xz | |
core: remove --edlout functionality
This could write .edl files in MPlayer's format. Support for playing
these files has been removed from mplayer2 quite a while ago. (mplayer2
can play its own, "new" .edl format, but does not support writing it.)
Since this is a rather obscure functionality, and it's not really clear
how it should behave (e.g. what should it do if a new file is played),
and wasn't all that great to begin with (what if you made a mistake?
the "edl_mark" command sucks for editing), get rid of it.
Suggestions how to reimplement this in a nicer way are welcome. If it's
just about retrieving timecodes, this in input.conf will do:
KEY print_text "position: ${=time-pos}"
Diffstat (limited to 'core/mplayer.c')
| -rw-r--r-- | core/mplayer.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/core/mplayer.c b/core/mplayer.c index 819c182a2e..5d63ef9f9b 100644 --- a/core/mplayer.c +++ b/core/mplayer.c @@ -230,9 +230,6 @@ static int play_n_frames_mf = -1; // --- -FILE *edl_fd; // file to write to when in -edlout mode. -char *edl_output_filename; // file to put EDL entries in (-edlout) - int use_filedir_conf; #include "core/mp_common.h" @@ -3898,16 +3895,6 @@ static void play_current_file(struct MPContext *mpctx) mp_tmsg(MSGT_CPLAYER, MSGL_INFO, "Playing %s.\n", mpctx->filename); - if (edl_output_filename) { - if (edl_fd) - fclose(edl_fd); - if ((edl_fd = fopen(edl_output_filename, "w")) == NULL) { - mp_tmsg(MSGT_CPLAYER, MSGL_ERR, - "Can't open EDL file [%s] for writing.\n", - edl_output_filename); - } - } - //============ Open & Sync STREAM --- fork cache2 ==================== assert(mpctx->stream == NULL); @@ -4399,7 +4386,6 @@ int main(int argc, char *argv[]) struct MPContext *mpctx = talloc(NULL, MPContext); *mpctx = (struct MPContext){ - .begin_skip = MP_NOPTS_VALUE, .file_format = DEMUXER_TYPE_UNKNOWN, .last_dvb_step = 1, .terminal_osd_text = talloc_strdup(mpctx, ""), |