[FFmpeg-cvslog] Revert "avutil/timecode: fix sscanf format string with garbage at the end"

Marton Balint git at videolan.org
Sat Jan 23 21:07:43 EET 2021


ffmpeg | branch: master | Marton Balint <cus at passwd.hu> | Sat Jan 16 09:42:01 2021 +0100| [16766bf8a8e477da09337801b96f732740a0b279] | committer: Marton Balint

Revert "avutil/timecode: fix sscanf format string with garbage at the end"

This reverts commit 6696a07ac62bfec49dd488510a719367918b9f7a.

It is wrong to restrict timecodes to always contain leading zeros or for hours
or frames to be 2 chars only.

Signed-off-by: Marton Balint <cus at passwd.hu>

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

 libavutil/timecode.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavutil/timecode.c b/libavutil/timecode.c
index 280e4cacfb..b1b504edbf 100644
--- a/libavutil/timecode.c
+++ b/libavutil/timecode.c
@@ -252,7 +252,7 @@ int av_timecode_init_from_string(AVTimecode *tc, AVRational rate, const char *st
     char c;
     int hh, mm, ss, ff, flags;
 
-    if (sscanf(str, "%02u:%02u:%02u%c%02u", &hh, &mm, &ss, &c, &ff) != 5) {
+    if (sscanf(str, "%d:%d:%d%c%d", &hh, &mm, &ss, &c, &ff) != 5) {
         av_log(log_ctx, AV_LOG_ERROR, "Unable to parse timecode, "
                                       "syntax: hh:mm:ss[:;.]ff\n");
         return AVERROR_INVALIDDATA;



More information about the ffmpeg-cvslog mailing list