Merge commit 'dcc39ee10e82833ce24aa57926c00ffeb1948198'

[ffmpeg] / libpostproc / version.h

diff --git a/libpostproc/version.h b/libpostproc/version.h
index 3d7f8ea472d7464ad3f36bf37380bb5877945ad9..79eea7c248a08fb611b628bd623f334b4f7e7ae7 100644 (file)
--- a/libpostproc/version.h
+++ b/libpostproc/version.h
@@ -28,8 +28,8 @@
 
 #include "libavutil/avutil.h"
 
-#define LIBPOSTPROC_VERSION_MAJOR  54
-#define LIBPOSTPROC_VERSION_MINOR   6
+#define LIBPOSTPROC_VERSION_MAJOR  55
+#define LIBPOSTPROC_VERSION_MINOR   0
 #define LIBPOSTPROC_VERSION_MICRO 100
 
 #define LIBPOSTPROC_VERSION_INT AV_VERSION_INT(LIBPOSTPROC_VERSION_MAJOR, \
@@ -42,8 +42,4 @@
 
 #define LIBPOSTPROC_IDENT       "postproc" AV_STRINGIFY(LIBPOSTPROC_VERSION)
 
-#ifndef FF_API_QP_TYPE
-#define FF_API_QP_TYPE     (LIBPOSTPROC_VERSION_MAJOR < 55)
-#endif
-
 #endif /* POSTPROC_VERSION_H */