Imported Debian version 2.5.0~trusty1.1

[deb_ffmpeg.git] / ffmpeg / libswscale / version.h

diff --git a/ffmpeg/libswscale/version.h b/ffmpeg/libswscale/version.h
index b76488381911deea4675935a69be31e6074ce976..228c5770eb9702b54e8ac1fcc9d8886933fcec45 100644 (file)
--- a/ffmpeg/libswscale/version.h
+++ b/ffmpeg/libswscale/version.h
@@ -27,8 +27,8 @@
 #include "libavutil/version.h"
 
 #define LIBSWSCALE_VERSION_MAJOR 3
-#define LIBSWSCALE_VERSION_MINOR 0
-#define LIBSWSCALE_VERSION_MICRO 100
+#define LIBSWSCALE_VERSION_MINOR 1
+#define LIBSWSCALE_VERSION_MICRO 101
 
 #define LIBSWSCALE_VERSION_INT  AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \
                                                LIBSWSCALE_VERSION_MINOR, \
@@ -49,9 +49,6 @@
 #ifndef FF_API_SWS_CPU_CAPS
 #define FF_API_SWS_CPU_CAPS    (LIBSWSCALE_VERSION_MAJOR < 4)
 #endif
-#ifndef FF_API_SWS_FORMAT_NAME
-#define FF_API_SWS_FORMAT_NAME  (LIBSWSCALE_VERSION_MAJOR < 3)
-#endif
 #ifndef FF_API_ARCH_BFIN
 #define FF_API_ARCH_BFIN       (LIBSWSCALE_VERSION_MAJOR < 4)
 #endif