summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libswscale/swscale.h2
-rw-r--r--libswscale/version.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/libswscale/swscale.h b/libswscale/swscale.h
index ace7c01839..5f6ae0ff46 100644
--- a/libswscale/swscale.h
+++ b/libswscale/swscale.h
@@ -80,9 +80,9 @@ const char *swscale_license(void);
//input subsampling info
#define SWS_FULL_CHR_H_INP 0x4000
#define SWS_DIRECT_BGR 0x8000
-#define SWS_ERROR_DIFFUSION 0x20000
#define SWS_ACCURATE_RND 0x40000
#define SWS_BITEXACT 0x80000
+#define SWS_ERROR_DIFFUSION 0x800000
#if FF_API_SWS_CPU_CAPS
/**
diff --git a/libswscale/version.h b/libswscale/version.h
index 49e280d3c8..c430f2def8 100644
--- a/libswscale/version.h
+++ b/libswscale/version.h
@@ -27,8 +27,8 @@
#include "libavutil/avutil.h"
#define LIBSWSCALE_VERSION_MAJOR 2
-#define LIBSWSCALE_VERSION_MINOR 1
-#define LIBSWSCALE_VERSION_MICRO 103
+#define LIBSWSCALE_VERSION_MINOR 2
+#define LIBSWSCALE_VERSION_MICRO 100
#define LIBSWSCALE_VERSION_INT AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \
LIBSWSCALE_VERSION_MINOR, \