[FFmpeg-cvslog] Revert "avformat/hls: Require the file extension to be m3u / m3u8 for probing to succeed"

Michael Niedermayer git at videolan.org
Mon Feb 1 15:31:22 CET 2016


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Mon Feb  1 00:05:33 2016 +0100| [af24b1c0cd3cf57c6f5010d69e6d22bfc399a8e4] | committer: Michael Niedermayer

Revert "avformat/hls: Require the file extension to be m3u / m3u8 for probing to succeed"

This can cause problems with urls that have arguments after the filename

This reverts commit b0c57206d583517a5ea35dd7f365f8260d9106f2.

Reviewed-by: wm4 <nfxjfg at googlemail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=af24b1c0cd3cf57c6f5010d69e6d22bfc399a8e4
---

 libavformat/hls.c |    3 ---
 1 file changed, 3 deletions(-)

diff --git a/libavformat/hls.c b/libavformat/hls.c
index dce8a5c..2d8e6c0 100644
--- a/libavformat/hls.c
+++ b/libavformat/hls.c
@@ -1984,9 +1984,6 @@ static int hls_probe(AVProbeData *p)
     if (strncmp(p->buf, "#EXTM3U", 7))
         return 0;
 
-    if (p->filename && *p->filename && !av_match_ext(p->filename, "m3u8,m3u"))
-        return 0;
-
     if (strstr(p->buf, "#EXT-X-STREAM-INF:")     ||
         strstr(p->buf, "#EXT-X-TARGETDURATION:") ||
         strstr(p->buf, "#EXT-X-MEDIA-SEQUENCE:"))



More information about the ffmpeg-cvslog mailing list