diff options
Diffstat (limited to 'core/timeline')
| -rw-r--r-- | core/timeline/tl_cue.c | 6 | ||||
| -rw-r--r-- | core/timeline/tl_edl.c | 4 | ||||
| -rw-r--r-- | core/timeline/tl_matroska.c | 12 |
3 files changed, 11 insertions, 11 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); diff --git a/core/timeline/tl_edl.c b/core/timeline/tl_edl.c index 6096d03b6a..4afb346dae 100644 --- a/core/timeline/tl_edl.c +++ b/core/timeline/tl_edl.c @@ -354,10 +354,10 @@ void build_edl_timeline(struct MPContext *mpctx) mpctx->num_sources = 1; for (int i = 0; i < num_sources; i++) { - struct stream *s = stream_open(edl_ids[i].filename, &mpctx->opts); + struct stream *s = stream_open(edl_ids[i].filename, mpctx->opts); if (!s) goto openfail; - struct demuxer *d = demux_open(s, NULL, NULL, &mpctx->opts); + struct demuxer *d = demux_open(s, NULL, NULL, mpctx->opts); if (!d) { free_stream(s); openfail: diff --git a/core/timeline/tl_matroska.c b/core/timeline/tl_matroska.c index 7c100618a3..cc6e62d429 100644 --- a/core/timeline/tl_matroska.c +++ b/core/timeline/tl_matroska.c @@ -116,7 +116,7 @@ static char **find_files(const char *original_file, const char *suffix) static int enable_cache(struct MPContext *mpctx, struct stream **stream, struct demuxer **demuxer, struct demuxer_params *params) { - struct MPOpts *opts = &mpctx->opts; + struct MPOpts *opts = mpctx->opts; if (opts->stream_cache_size <= 0) return 0; @@ -125,7 +125,7 @@ static int enable_cache(struct MPContext *mpctx, struct stream **stream, free_demuxer(*demuxer); free_stream(*stream); - *stream = stream_open(filename, &mpctx->opts); + *stream = stream_open(filename, opts); if (!*stream) { talloc_free(filename); return -1; @@ -137,7 +137,7 @@ static int enable_cache(struct MPContext *mpctx, struct stream **stream, opts->stream_cache_min_percent, opts->stream_cache_seek_min_percent); - *demuxer = demux_open(*stream, "mkv", params, &mpctx->opts); + *demuxer = demux_open(*stream, "mkv", params, opts); if (!*demuxer) { talloc_free(filename); free_stream(*stream); @@ -159,10 +159,10 @@ static bool check_file_seg(struct MPContext *mpctx, struct demuxer **sources, .matroska_wanted_segment = segment, .matroska_was_valid = &was_valid, }; - 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, "mkv", ¶ms, &mpctx->opts); + struct demuxer *d = demux_open(s, "mkv", ¶ms, mpctx->opts); if (!d) { free_stream(s); @@ -258,7 +258,7 @@ static int find_ordered_chapter_sources(struct MPContext *mpctx, void build_ordered_chapter_timeline(struct MPContext *mpctx) { - struct MPOpts *opts = &mpctx->opts; + struct MPOpts *opts = mpctx->opts; if (!opts->ordered_chapters) { mp_msg(MSGT_CPLAYER, MSGL_INFO, "File uses ordered chapters, but " |