Update for FFmpeg 2.3.3n2.3.3

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

3 files changed, 8 insertions, 2 deletions

diff --git a/Changelog b/Changelog
index 57dbfbe3f9..98179ea946 100644
--- a/Changelog
+++ b/Changelog
@@ -1,6 +1,12 @@
 Entries are sorted chronologically from oldest to youngest within each release,
 releases are sorted from youngest to oldest.
 
+version 2.3.3:
+- h264: fix grayscale only decoding with weighted prediction
+- mjpegdec: support AV_PIX_FMT_YUV420P16 with upscale_h
+- proresenc_ks: fix buffer overflow
+- matroskadec: fix crash
+
 version 2.3.2:
 - snow: fix null pointer dereference
 - huffyucdec: fix overread
diff --git a/RELEASE b/RELEASE
index f90b1afc08..0bee604df7 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1 @@
-2.3.2
+2.3.3
diff --git a/doc/Doxyfile b/doc/Doxyfile
index 13593d849c..4159ce0fe3 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME           = FFmpeg
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = 2.3.2
+PROJECT_NUMBER         = 2.3.3
 
 # With the PROJECT_LOGO tag one can specify a logo or icon that is included
 # in the documentation. The maximum height of the logo should not exceed 55