RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/sccdec: simplify 2 sscanf calls 

Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2017-01-29 18:11:09 +01:00
parent cba4f0e97e
commit 76331361a5
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/sccdec.c
View File

@ -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;