diff options
Diffstat (limited to 'demux')
| -rw-r--r-- | demux/demux_lavf.c | 4 | ||||
| -rw-r--r-- | demux/demux_subreader.c | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c index e1800295cc..4d84bd20d4 100644 --- a/demux/demux_lavf.c +++ b/demux/demux_lavf.c @@ -350,9 +350,7 @@ static int lavf_check_file(demuxer_t *demuxer, enum demux_check check) success: - demuxer->filetype = priv->avif->long_name; - if (!demuxer->filetype) - demuxer->filetype = priv->avif->name; + demuxer->filetype = priv->avif->name; return 0; } 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; |