diff --git a/libavcodec/tableprint.h b/libavcodec/tableprint.h
index 6f61c7124b..794e0264ff 100644
--- a/libavcodec/tableprint.h
+++ b/libavcodec/tableprint.h
@@ -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");                                                 \
diff --git a/libavcodec/tableprint_vlc.h b/libavcodec/tableprint_vlc.h
index e7c6764573..d8b3d27ef7 100644
--- a/libavcodec/tableprint_vlc.h
+++ b/libavcodec/tableprint_vlc.h
@@ -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,                    \