sysutils/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-10-24 02:09:03 +03:00
Code Activity

avcodec/tableprint: use %zu unconditionally

Browse Source 
The UCRT printf supports %zu, and pre-UCRT MSVC is no longer supported.

Signed-off-by: Kacper Michajłow <kasper93@gmail.com>
This commit is contained in:
Kacper Michajłow
2026-08-22 17:15:11 +02:00
parent f2da195565
commit 68bf87cf4f
2 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/tableprint.h
View File

@@ -72,21 +72,11 @@ void write_uint32_t_2d_array(const void *, int, int);
void write_float_2d_array (const void *, int, int);
/** @} */ // end of printfuncs group
/*
* MSVC doesn't have %zu, since it was introduced in C99,
* but has its own %Iu for printing size_t values.
*/
#if defined(_MSC_VER)
#define FMT "Iu"
#else
#define FMT "zu"
#endif
#define WRITE_ARRAY_ALIGNED(prefix, align, type, name) \
do { \
const size_t array_size = FF_ARRAY_ELEMS(name); \
printf(prefix" DECLARE_ALIGNED("#align", " \
#type", "#name")[%"FMT"] = {\n", \
#type", "#name")[%zu] = {\n", \
array_size); \
write_##type##_array(name, array_size); \
printf("};\n"); \
@@ -95,7 +85,7 @@ void write_float_2d_array (const void *, int, int);
#define WRITE_ARRAY(prefix, type, name) \
do { \
const size_t array_size = FF_ARRAY_ELEMS(name); \
printf(prefix" "#type" "#name"[%"FMT"] = {\n", \
printf(prefix" "#type" "#name"[%zu] = {\n", \
array_size); \
write_##type##_array(name, array_size); \
printf("};\n"); \
@@ -105,7 +95,7 @@ void write_float_2d_array (const void *, int, int);
do { \
const size_t array_size1 = FF_ARRAY_ELEMS(name); \
const size_t array_size2 = FF_ARRAY_ELEMS(name[0]); \
printf(prefix" "#type" "#name"[%"FMT"][%"FMT"] = {\n", \
printf(prefix" "#type" "#name"[%zu][%zu] = {\n", \
array_size1, array_size2 ); \
write_##type##_2d_array(name, array_size1, array_size2); \
printf("};\n"); \

2
libavcodec/tableprint_vlc.h
View File

@@ -67,7 +67,7 @@ static void write_vlc_type(const VLC *vlc, const VLCElem *base_table, const char
do { \
int i; \
const size_t array_size = FF_ARRAY_ELEMS(name); \
printf(prefix" VLC "#name"[%"FMT"] = {{\n", \
printf(prefix" VLC "#name"[%zu] = {{\n", \
array_size); \
for (i = 0; i < array_size; i++) { \
write_vlc_type(name + i, \