summaryrefslogtreecommitdiffstats
path: root/demux/demux_subreader.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-01-23 15:59:06 +0100
committerwm4 <wm4@nowhere>2015-01-23 15:59:06 +0100
commit9681d42a9427c8860f1a768a289de3679a9cd9e8 (patch)
tree87d91b0650a50253688372eca63164956d24dd6d /demux/demux_subreader.c
parenta0ed62fc1d427bc02af8a2865d491ebde73ad2f0 (diff)
downloadmpv-9681d42a9427c8860f1a768a289de3679a9cd9e8.tar.bz2
mpv-9681d42a9427c8860f1a768a289de3679a9cd9e8.tar.xz
command: export file format as property
Repurpose demuxer->filetype for this. It used to be used to print a human readable format description; change it to a symbolic format name and export it as property. Unfortunately, libavformat has its own weird conventions, which are reflected through the new property, e.g. the .mp4 case mentioned in the manpage. Fixes #1504.
Diffstat (limited to 'demux/demux_subreader.c')
-rw-r--r--demux/demux_subreader.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/demux/demux_subreader.c b/demux/demux_subreader.c
index f6454aaf2e..145754be6d 100644
--- a/demux/demux_subreader.c
+++ b/demux/demux_subreader.c
@@ -547,8 +547,8 @@ static bool subreader_autodetect(stream_t *fd, struct MPOpts *opts,
{ sub_read_line_subrip, NULL, "subviewer" },
{ sub_read_line_subviewer, NULL, "subrip", "subrip" },
{ sub_read_line_ssa, NULL, "ssa", "ass-text" },
- { sub_read_line_subviewer2, NULL, "subviewer 2.0" },
- { sub_read_line_subrip09, NULL, "subrip 0.9" },
+ { sub_read_line_subviewer2, NULL, "subviewer2" },
+ { sub_read_line_subrip09, NULL, "subrip9" },
{ sub_read_line_mpl2, NULL, "mpl2" }
};
const struct subreader *srp;