[FFmpeg-cvslog] avformat/sccdec: use av_sscanf() instead

Paul B Mahol git at videolan.org
Tue Feb 4 21:40:46 EET 2020


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Tue Feb  4 20:37:26 2020 +0100| [a15618d2c3a20323530376701d44984a749315d7] | committer: Paul B Mahol

avformat/sccdec: use av_sscanf() instead

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

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

diff --git a/libavformat/sccdec.c b/libavformat/sccdec.c
index 769adc7dd9..b9042b39ac 100644
--- a/libavformat/sccdec.c
+++ b/libavformat/sccdec.c
@@ -22,6 +22,7 @@
 #include "avformat.h"
 #include "internal.h"
 #include "subtitles.h"
+#include "libavutil/avstring.h"
 #include "libavutil/bprint.h"
 #include "libavutil/intreadwrite.h"
 
@@ -95,7 +96,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)
+        if (av_sscanf(line, "%d:%d:%d%*[:;]%d", &hh1, &mm1, &ss1, &fs1) != 4)
             continue;
 
         ts_start = (hh1 * 3600LL + mm1 * 60LL + ss1) * 1000LL + fs1 * 33;
@@ -106,7 +107,7 @@ static int scc_read_header(AVFormatContext *s)
             if (len2 > 13)
                 break;
         }
-        if (sscanf(line2, "%d:%d:%d%*[:;]%d", &hh2, &mm2, &ss2, &fs2) != 4)
+        if (av_sscanf(line2, "%d:%d:%d%*[:;]%d", &hh2, &mm2, &ss2, &fs2) != 4)
             continue;
 
         ts_end = (hh2 * 3600LL + mm2 * 60LL + ss2) * 1000LL + fs2 * 33;
@@ -123,7 +124,7 @@ try_again:
             if (!ptr)
                 break;
 
-            if (sscanf(ptr, "%c%c%c%c", &c1, &c2, &c3, &c4) != 4)
+            if (av_sscanf(ptr, "%c%c%c%c", &c1, &c2, &c3, &c4) != 4)
                 break;
 
             lline = NULL;



More information about the ffmpeg-cvslog mailing list