diff options
author | wm4 <wm4@nowhere> | 2016-02-25 22:49:50 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2016-02-25 22:49:50 +0100 |
commit | 08dbaf1dcc43b5075976c35a2cc7060ef92e5f79 (patch) | |
tree | 3c5f40f0fa4b027185a2292332bd6d818c19efdf /demux | |
parent | 71fa2e6fc22a1b53dd1ddb1ca877794867f7ac5f (diff) | |
download | mpv-08dbaf1dcc43b5075976c35a2cc7060ef92e5f79.tar.bz2 mpv-08dbaf1dcc43b5075976c35a2cc7060ef92e5f79.tar.xz |
demux_timeline: slightly improve reported file format
Report the underlying demuxer's format. Since there can be many demuxers
participating, pick the "main" segment.
Diffstat (limited to 'demux')
-rw-r--r-- | demux/demux_timeline.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/demux/demux_timeline.c b/demux/demux_timeline.c index 07fe4d102a..9fba3d5abb 100644 --- a/demux/demux_timeline.c +++ b/demux/demux_timeline.c @@ -358,6 +358,8 @@ static int d_open(struct demuxer *demuxer, enum demux_check check) demuxer->seekable = true; demuxer->partially_seekable = true; + demuxer->filetype = meta->filetype ? meta->filetype : meta->desc->name; + reselect_streams(demuxer); return 0; @@ -389,7 +391,7 @@ static int d_control(struct demuxer *demuxer, int cmd, void *arg) const demuxer_desc_t demuxer_desc_timeline = { .name = "timeline", - .desc = "timeline segment merging wrapper", + .desc = "timeline segments", .fill_buffer = d_fill_buffer, .open = d_open, .close = d_close, |