diff options
| author | wm4 <nfxjfg@googlemail.com> | 2013-08-08 01:04:36 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2013-09-03 20:38:40 +0200 |
| commit | 060c6c4647530762ab594f62a964cf9f9621e8ce (patch) | |
| tree | 937cd0761b87516dd393f434d76f702809585d2a /libavformat | |
| parent | 902a5fa7228d92bf7e0a8f523a25cf72d31afab4 (diff) | |
| download | ffmpeg-060c6c4647530762ab594f62a964cf9f9621e8ce.tar.gz | |
avformat/mpl2dec: handle files with CRLF linebreaks correctly
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 <u@pkh.me>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mpl2dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |