summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-05-07 22:13:35 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-05-07 22:13:35 +0300
commite1cd86076fc830bf2d475539543cf3dacc287ca7 (patch)
tree3651783063fcca8af4645f61f4196276d6f7f6a9 /libmpdemux
parent4c6e3ac01bb158ddaa5603dc93fc7efb91b367b1 (diff)
parent1292c8adc351b1bf461354cd632b39ec3303a8f2 (diff)
downloadmpv-e1cd86076fc830bf2d475539543cf3dacc287ca7.tar.bz2
mpv-e1cd86076fc830bf2d475539543cf3dacc287ca7.tar.xz
Merge svn changes up to r31141
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_lavf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c
index bbf7218e43..2cdacff30c 100644
--- a/libmpdemux/demux_lavf.c
+++ b/libmpdemux/demux_lavf.c
@@ -428,7 +428,7 @@ static void handle_stream(demuxer_t *demuxer, AVFormatContext *avfc, int i) {
break;
sh_sub = new_sh_sub_sid(demuxer, i, priv->sub_streams);
if(!sh_sub) break;
- stream_type = "subtitles";
+ stream_type = "subtitle";
priv->sstreams[priv->sub_streams] = i;
sh_sub->type = type;
if (codec->extradata_size) {