Update for 3.2.12n3.2.12

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

3 files changed, 11 insertions, 2 deletions

diff --git a/Changelog b/Changelog
index b05034d271..1269c350c9 100644
--- a/Changelog
+++ b/Changelog
@@ -1,6 +1,15 @@
 Entries are sorted chronologically from oldest to youngest within each release,
 releases are sorted from youngest to oldest.
 
+version 3.2.12:
+- avcodec/dvdsub_parser: Allocate input padding
+- avcodec/dvdsub_parser: Init output buf/size
+- avcodec/dirac_dwt_template: Fix signedness regression in interleave()
+- avformat/movenc: Write version 2 of audio atom if channels is not known
+- swresample/arm: rename labels to fix xcode build error
+- avformat/utils: fix mixed declarations and code
+- avcodec/imgconvert: fix possible null pointer dereference
+
 version 3.2.11:
 - avformat/mov: Fix extradata memleak
 - lavc/libopusdec: Allow avcodec_open2 to call .close
diff --git a/RELEASE b/RELEASE
index 17ce91803c..275e51e5e5 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1 @@
-3.2.11
+3.2.12
diff --git a/doc/Doxyfile b/doc/Doxyfile
index d72a1c5f09..b9bddac6e7 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = FFmpeg
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 3.2.11
+PROJECT_NUMBER         = 3.2.12
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a