[FFmpeg-cvslog] avformat/sccdec: simplify 2 sscanf calls

Paul B Mahol git at videolan.org
Mon Jan 30 12:03:03 EET 2017


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Sun Jan 29 18:11:09 2017 +0100| [76331361a51b2a2e1be0305c2c2c2c4f5d567d4a] | committer: Paul B Mahol

avformat/sccdec: simplify 2 sscanf calls

Signed-off-by: Paul B Mahol <onemda at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=76331361a51b2a2e1be0305c2c2c2c4f5d567d4a
---

 libavformat/sccdec.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/libavformat/sccdec.c b/libavformat/sccdec.c
index ddf5fdf..89d21b9 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;



More information about the ffmpeg-cvslog mailing list