[FFmpeg-cvslog] avformat/hlsenc: Redo checking for strftime %s support to avoid warnings
Andreas Rheinhardt
git at videolan.org
Tue Mar 5 16:18:07 EET 2024
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Tue Mar 5 10:19:25 2024 +0100| [d085f341d66ebfe5b29d67773e89c253f4eb99a8] | committer: Andreas Rheinhardt
avformat/hlsenc: Redo checking for strftime %s support to avoid warnings
This is intended to avoid -Wformat= warnings on systems
where %s might not be supported (and also generally emitted
by GCC with -pedantic).
Reviewed-by: Liu Steven <lq at chinaffmpeg.org>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d085f341d66ebfe5b29d67773e89c253f4eb99a8
---
libavformat/hlsenc.c | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index a19b9bb3d1..d5cd627e59 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -1878,18 +1878,23 @@ fail:
static const char * get_default_pattern_localtime_fmt(AVFormatContext *s)
{
+ HLSContext *hls = s->priv_data;
+#if HAVE_LIBC_MSVCRT
+ // no %s support on MSVC, which invokes the invalid parameter handler
+ // on unsupported format strings, instead of returning an error
+ int strftime_s_supported = 0;
+#else
char b[21];
time_t t = time(NULL);
- struct tm *p, tmbuf;
- HLSContext *hls = s->priv_data;
-
- p = localtime_r(&t, &tmbuf);
+ struct tm tmbuf, *p = localtime_r(&t, &tmbuf);
// no %s support when strftime returned error or left format string unchanged
- // also no %s support on MSVC, which invokes the invalid parameter handler on unsupported format strings, instead of returning an error
+ int strftime_s_supported = strftime(b, sizeof(b), "%s", p) && strcmp(b, "%s");
+#endif
+
if (hls->segment_type == SEGMENT_TYPE_FMP4) {
- return (HAVE_LIBC_MSVCRT || !strftime(b, sizeof(b), "%s", p) || !strcmp(b, "%s")) ? "-%Y%m%d%H%M%S.m4s" : "-%s.m4s";
+ return strftime_s_supported ? "-%s.m4s" : "-%Y%m%d%H%M%S.m4s";
}
- return (HAVE_LIBC_MSVCRT || !strftime(b, sizeof(b), "%s", p) || !strcmp(b, "%s")) ? "-%Y%m%d%H%M%S.ts" : "-%s.ts";
+ return strftime_s_supported ? "-%s.ts" : "-%Y%m%d%H%M%S.ts";
}
static int append_postfix(char *name, int name_buf_len, int i)
More information about the ffmpeg-cvslog
mailing list