Skip to content

F
ffmpeg
Commit 76331361 authored by Paul B Mahol's avatar Paul B Mahol
Browse files
Options

avformat/sccdec: simplify 2 sscanf calls 

Signed-off-by: 's avatarPaul B Mahol <onemda@gmail.com>
parent cba4f0e9
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
libavformat/sccdec.c
View file @ 76331361
......@@ -94,8 +94,7 @@ static int scc_read_header(AVFormatContext *s)
if (!strncmp(line, "Scenarist_SCC V1.0", 18))
continue;
if (sscanf(line, "%d:%d:%d:%d", &hh1, &mm1, &ss1, &fs1) != 4 &&
sscanf(line, "%d:%d:%d;%d", &hh1, &mm1, &ss1, &fs1) != 4)
if (sscanf(line, "%d:%d:%d%*[:;]%d", &hh1, &mm1, &ss1, &fs1) != 4)
continue;
ts_start = (hh1 * 3600LL + mm1 * 60LL + ss1) * 1000LL + fs1 * 33;
......@@ -105,8 +104,7 @@ static int scc_read_header(AVFormatContext *s)
if (len2 > 13)
break;
}
if (sscanf(line2, "%d:%d:%d:%d", &hh2, &mm2, &ss2, &fs2) != 4 &&
sscanf(line2, "%d:%d:%d;%d", &hh2, &mm2, &ss2, &fs2) != 4)
if (sscanf(line2, "%d:%d:%d%*[:;]%d", &hh2, &mm2, &ss2, &fs2) != 4)
continue;
ts_end = (hh2 * 3600LL + mm2 * 60LL + ss2) * 1000LL + fs2 * 33;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment