[FFmpeg-cvslog] sws: Fix error diffusion flag

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jan 19 23:11:26 2013 +0100| [f94220ac7ad099425b5fc35170ef411b03c84397] | committer: Michael Niedermayer

sws: Fix error diffusion flag

The used flag was mistakenly overlapping with chroma drop

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f94220ac7ad099425b5fc35170ef411b03c84397
---

 libswscale/swscale.h |    2 +-
 libswscale/version.h |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libswscale/swscale.h b/libswscale/swscale.h
index ace7c01..5f6ae0f 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 49e280d..c430f2d 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, \