diff options
| author | wm4 <wm4@nowhere> | 2019-01-11 14:10:41 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2019-09-19 20:37:04 +0200 |
| commit | 87db2f24e8eca23664dc23128b8fca2b5d07125d (patch) | |
| tree | fe6250c363bad702b064533f21ccdea49890ee3f /demux/demux_timeline.c | |
| parent | a09396ee609af71f49f70521320e87989577b577 (diff) | |
| download | mpv-87db2f24e8eca23664dc23128b8fca2b5d07125d.tar.bz2 mpv-87db2f24e8eca23664dc23128b8fca2b5d07125d.tar.xz | |
demux_edl, cue, mkv: slightly nicer file format indication
Instead of just using "edl/" for the file format, report mkv_oc if it's
generated from ordered chapters, "cue/" if from .cue, "multi/" if it's
from EDL but only for adding separate streams, "dash/" if it's from EDL
but only using the DASH hack, and "edl/" for everything else.
The EDL variants are mostly special-cased to the variants the ytdl
wrapper usually generates.
This has no effect other than what the command.c file-format property
returns.
Diffstat (limited to 'demux/demux_timeline.c')
| -rw-r--r-- | demux/demux_timeline.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/demux/demux_timeline.c b/demux/demux_timeline.c index 1d692d8387..9a1fb8aed4 100644 --- a/demux/demux_timeline.c +++ b/demux/demux_timeline.c @@ -466,8 +466,8 @@ static int d_open(struct demuxer *demuxer, enum demux_check check) demuxer->seekable = true; demuxer->partially_seekable = false; - demuxer->filetype = talloc_asprintf(p, "edl/%s%s", - p->sources[0]->dash ? "dash/" : "", + demuxer->filetype = talloc_asprintf(p, "%s/%s", + p->tl->format, meta->filetype ? meta->filetype : meta->desc->name); reselect_streams(demuxer); |