summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-12-21 20:24:20 +0100
committerwm4 <wm4@nowhere>2013-12-21 21:43:16 +0100
commit3dbc9007b080028f0aebbbf8b9ab1233cd70c45b (patch)
treee6e46e5dd238338c44d421ef4f9101c9898c3cbf /common
parent9149e2af568d4cb251f8b105f360c3e6b9fd9d86 (diff)
downloadmpv-3dbc9007b080028f0aebbbf8b9ab1233cd70c45b.tar.bz2
mpv-3dbc9007b080028f0aebbbf8b9ab1233cd70c45b.tar.xz
demux: mp_msg conversions
The TV code pretends to be part of stream/, but it's actually demuxer code too. The audio_in code is shared between the TV code and stream_radio.c, so stream_radio.c needs a small hack until stream.c is converted.
Diffstat (limited to 'common')
-rw-r--r--common/playlist_parser.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/playlist_parser.c b/common/playlist_parser.c
index ee5fe07b91..f33f7204b6 100644
--- a/common/playlist_parser.c
+++ b/common/playlist_parser.c
@@ -539,7 +539,7 @@ static struct playlist *do_parse(struct stream* stream, bool forced,
};
bool success = false;
- struct demuxer *pl_demux = demux_open(stream, "playlist", NULL, global->opts);
+ struct demuxer *pl_demux = demux_open(stream, "playlist", NULL, global);
if (pl_demux && pl_demux->playlist) {
playlist_transfer_entries(p.pl, pl_demux->playlist);
success = true;