diff options
| author | Paul B Mahol <onemda@gmail.com> | 2017-01-29 18:11:09 +0100 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2017-01-30 11:00:58 +0100 |
| commit | 76331361a51b2a2e1be0305c2c2c2c4f5d567d4a (patch) | |
| tree | 722e392fc872ecc3be3e4796f00c08ec17055ffd | |
| parent | cba4f0e97ecbbde7c71ec7a7ae3eb1469b34545b (diff) | |
| download | ffmpeg-76331361a51b2a2e1be0305c2c2c2c4f5d567d4a.tar.gz | |
avformat/sccdec: simplify 2 sscanf calls
Signed-off-by: Paul B Mahol <onemda@gmail.com>
| -rw-r--r-- | libavformat/sccdec.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libavformat/sccdec.c b/libavformat/sccdec.c index ddf5fdf870..89d21b9c1f 100644 --- a/libavformat/sccdec.c +++ b/libavformat/sccdec.c @@ -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; |