Merge commit '0fc61c6ab6912a2f0c40fdd3f3c591bc2a33efd4'

[ffmpeg] / cmdutils.c

diff --git a/cmdutils.c b/cmdutils.c
index 41daa9565d01ffc73556dbbbcf4c051f8a4f07b5..ceec2d1966f119b07e65a43599f9d12b1ccf3fef 100644 (file)
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -52,6 +52,7 @@
 #include "libavutil/opt.h"
 #include "libavutil/cpu.h"
 #include "libavutil/ffversion.h"
+#include "libavutil/version.h"
 #include "cmdutils.h"
 #if CONFIG_NETWORK
 #include "libavformat/network.h"
@@ -1058,7 +1059,8 @@ static int warned_cfg = 0;
                    LIB##LIBNAME##_VERSION_MAJOR,                        \
                    LIB##LIBNAME##_VERSION_MINOR,                        \
                    LIB##LIBNAME##_VERSION_MICRO,                        \
-                   version >> 16, version >> 8 & 0xff, version & 0xff); \
+                   AV_VERSION_MAJOR(version), AV_VERSION_MINOR(version),\
+                   AV_VERSION_MICRO(version));                          \
         }                                                               \
         if (flags & SHOW_CONFIG) {                                      \
             const char *cfg = libname##_configuration();                \