RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

demux_timeline: slightly improve reported file format 

Report the underlying demuxer's format. Since there can be many demuxers
participating, pick the "main" segment.
This commit is contained in:
wm4 2016-02-25 22:49:50 +01:00
parent 71fa2e6fc2
commit 08dbaf1dcc
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
demux/demux_timeline.c
View File

@ -358,6 +358,8 @@ static int d_open(struct demuxer *demuxer, enum demux_check check)
demuxer->seekable = true; demuxer->seekable = true;
demuxer->partially_seekable = true; demuxer->partially_seekable = true;
demuxer->filetype = meta->filetype ? meta->filetype : meta->desc->name;
reselect_streams(demuxer); reselect_streams(demuxer);
return 0; return 0;
@ -389,7 +391,7 @@ static int d_control(struct demuxer *demuxer, int cmd, void *arg)
const demuxer_desc_t demuxer_desc_timeline = { const demuxer_desc_t demuxer_desc_timeline = {
.name = "timeline", .name = "timeline",
.desc = "timeline segment merging wrapper", .desc = "timeline segments",
.fill_buffer = d_fill_buffer, .fill_buffer = d_fill_buffer,
.open = d_open, .open = d_open,
.close = d_close, .close = d_close,