From 060c6c4647530762ab594f62a964cf9f9621e8ce Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 8 Aug 2013 01:04:36 +0200 Subject: [PATCH] avformat/mpl2dec: handle files with CRLF linebreaks correctly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Skip the "\r" as normal text. Otherwise it will be the first character of the string passed to sscanf(), which then fill fail to match the timestamps. Signed-off-by: Clément Bœsch --- libavformat/mpl2dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mpl2dec.c b/libavformat/mpl2dec.c index b152cc8ddd..ffe1d83991 100644 --- a/libavformat/mpl2dec.c +++ b/libavformat/mpl2dec.c @@ -43,7 +43,7 @@ static int mpl2_probe(AVProbeData *p) if (sscanf(ptr, "[%"SCNd64"][%"SCNd64"]%c", &start, &end, &c) != 3 && sscanf(ptr, "[%"SCNd64"][]%c", &start, &c) != 2) return 0; - ptr += strcspn(ptr, "\r\n") + 1; + ptr += strcspn(ptr, "\n") + 1; if (ptr >= ptr_end) return 0; }