From 194e22118124b1c10b2634104a98fb2c57eb8981 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 11 May 2014 15:44:28 +0200 Subject: demux_playlist: fix m3u detection logic Caused failure to detect .pls files, because they were misdetected as m3u. The problem is that "forcing playlist files" and "forcing a specific playlist format" are not really treated separate, and in both cases p->force is set to true. This made m3u detect all files as m3u if --playlist was used. So correctly check whether the file format is actually being probed or not. --- demux/demux_playlist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'demux/demux_playlist.c') diff --git a/demux/demux_playlist.c b/demux/demux_playlist.c index f8f763c375..af24d4906f 100644 --- a/demux/demux_playlist.c +++ b/demux/demux_playlist.c @@ -69,7 +69,7 @@ static bool pl_eof(struct pl_parser *p) static int parse_m3u(struct pl_parser *p) { bstr line = bstr_strip(pl_get_line(p)); - if (!p->force && !bstr_equals0(line, "#EXTM3U")) + if (p->probing && !bstr_equals0(line, "#EXTM3U")) return -1; if (p->probing) return 0; -- cgit v1.2.3