summaryrefslogtreecommitdiffstats
path: root/core/timeline/tl_cue.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-07-27 21:24:54 +0200
committerwm4 <wm4@nowhere>2013-07-28 18:44:21 +0200
commitda2b4aa5870f407ad322b6116ed8d66a66dbeadf (patch)
tree4cee7047c5f522c9b98978170a218e118398029a /core/timeline/tl_cue.c
parent2fc07dcf302061c6f04a7570e2c1825bb2393513 (diff)
downloadmpv-da2b4aa5870f407ad322b6116ed8d66a66dbeadf.tar.bz2
mpv-da2b4aa5870f407ad322b6116ed8d66a66dbeadf.tar.xz
core: make mpctx->opts a pointer
Prevents some awkwardness in a later commit, and makes the code more uniform with other places where MPOpts is accessed. This is a pretty annoying commit (touches tons of lines all over the place), but it hurts only once.
Diffstat (limited to 'core/timeline/tl_cue.c')
-rw-r--r--core/timeline/tl_cue.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/timeline/tl_cue.c b/core/timeline/tl_cue.c
index 1953f46116..3c4a997982 100644
--- a/core/timeline/tl_cue.c
+++ b/core/timeline/tl_cue.c
@@ -188,10 +188,10 @@ static bool try_open(struct MPContext *mpctx, char *filename)
|| bstrcasecmp(bstr0(mpctx->demuxer->filename), bfilename) == 0)
return false;
- struct stream *s = stream_open(filename, &mpctx->opts);
+ 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->opts);
// 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_msg(MSGT_CPLAYER, MSGL_WARN, "CUE: Opening as BIN file!\n");
- d = demux_open(s, "rawaudio", NULL, &mpctx->opts);
+ d = demux_open(s, "rawaudio", NULL, mpctx->opts);
}
if (d) {
add_source(mpctx, d);