diff options
| author | wm4 <wm4@nowhere> | 2015-02-20 21:21:14 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-02-20 21:21:14 +0100 |
| commit | 6aa6778ac46672dd237acc86856353d133917f06 (patch) | |
| tree | d7e19e4c35ea99193b826fcd78e975c1bc376f62 /common | |
| parent | 6c1355be967751b194504ed73b053846fbae5fa9 (diff) | |
| download | mpv-6aa6778ac46672dd237acc86856353d133917f06.tar.bz2 mpv-6aa6778ac46672dd237acc86856353d133917f06.tar.xz | |
demux: change demux_open() signature
Fold the relatively obscure force_format parameter into demuxer_params.
Diffstat (limited to 'common')
| -rw-r--r-- | common/playlist.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/common/playlist.c b/common/playlist.c index 857f5cb030..70206b1cfe 100644 --- a/common/playlist.c +++ b/common/playlist.c @@ -278,7 +278,8 @@ struct playlist *playlist_parse_file(const char *file, struct mpv_global *global return NULL; } - struct demuxer *pl_demux = demux_open(stream, "playlist", NULL, global); + struct demuxer_params p = {.force_format = "playlist"}; + struct demuxer *pl_demux = demux_open(stream, &p, global); if (pl_demux && pl_demux->playlist) { ret = talloc_zero(NULL, struct playlist); playlist_transfer_entries(ret, pl_demux->playlist); |