sws: Fix error diffusion flag
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 19 Jan 2013 22:11:26 +0000 (23:11 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 19 Jan 2013 22:13:40 +0000 (23:13 +0100)
The used flag was mistakenly overlapping with chroma drop

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libswscale/swscale.h
libswscale/version.h

index ace7c01..5f6ae0f 100644 (file)
@@ -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
 /**
index 49e280d..c430f2d 100644 (file)
@@ -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, \