diff options
| author | wm4 <wm4@nowhere> | 2013-12-21 20:24:20 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-12-21 21:43:16 +0100 |
| commit | 3dbc9007b080028f0aebbbf8b9ab1233cd70c45b (patch) | |
| tree | e6e46e5dd238338c44d421ef4f9101c9898c3cbf /player/timeline/tl_cue.c | |
| parent | 9149e2af568d4cb251f8b105f360c3e6b9fd9d86 (diff) | |
| download | mpv-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 'player/timeline/tl_cue.c')
| -rw-r--r-- | player/timeline/tl_cue.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/player/timeline/tl_cue.c b/player/timeline/tl_cue.c index 646aa24ee3..80eaf5ef76 100644 --- a/player/timeline/tl_cue.c +++ b/player/timeline/tl_cue.c @@ -191,7 +191,7 @@ static bool try_open(struct MPContext *mpctx, char *filename) struct stream *s = stream_open(filename, mpctx->opts); if (!s) return false; - struct demuxer *d = demux_open(s, NULL, NULL, mpctx->opts); + struct demuxer *d = demux_open(s, NULL, NULL, mpctx->global); // Since .bin files are raw PCM data with no headers, we have to explicitly // open them. Also, try to avoid to open files that are most likely not .bin // files, as that would only play noise. Checking the file extension is @@ -200,7 +200,7 @@ static bool try_open(struct MPContext *mpctx, char *filename) // CD sector size (2352 bytes) if (!d && bstr_case_endswith(bfilename, bstr0(".bin"))) { MP_WARN(mpctx, "CUE: Opening as BIN file!\n"); - d = demux_open(s, "rawaudio", NULL, mpctx->opts); + d = demux_open(s, "rawaudio", NULL, mpctx->global); } if (d) { add_source(mpctx, d); |