Merge remote-tracking branch 'qatar/release/0.5' into release/0.5

* qatar/release/0.5:
  Release notes for 0.5.9
  Update changelog for 0.5.9 release

Conflicts:
	RELEASE

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

2 files changed, 36 insertions, 0 deletions

diff --git a/Changelog b/Changelog
index 68ccc62067..3a66ab0b88 100644
--- a/Changelog
+++ b/Changelog
@@ -2,6 +2,23 @@ Entries are sorted chronologically from oldest to youngest within each release,
 releases are sorted from youngest to oldest.
 
 
+version 0.5.9:
+- dpcm: ignore extra unpaired bytes in stereo streams (CVE-2011-3951)
+- h264: Add check for invalid chroma_format_idc (CVE-2012-0851)
+- adpcm: ADPCM Electronic Arts has always two channels (CVE-2012-0852)
+- kmvc: Check palsize (CVE-2011-3952)
+- qdm2: clip array indices returned by qdm2_get_vlc()
+- configure: properly check for mingw-w64 through installed headers
+- Replace every usage of -lvfw32 with what is particularly necessary for that case
+- mingw32: properly check if vfw capture is supported by the system headers
+- mingw32: merge checks for mingw-w64 and mingw32-runtime >= 3.15 into one
+- vfwcap: Include windows.h before vfw.h since the latter requires defines from the former
+- ea: check chunk_size for validity
+- eatqi: move "block" variable into context to ensure sufficient alignment for idct_put
+- tqi: Pass errors from the MB decoder
+- png: check bit depth for PAL8/Y400A pixel formats.
+
+
 version 0.5.8:
 
 - id3v2: fix skipping extended header in id3v2.4
diff --git a/RELEASE b/RELEASE
index eef90c8f8d..c934528c9b 100644
--- a/RELEASE
+++ b/RELEASE
@@ -198,6 +198,8 @@ Distributors and system integrators are encouraged
 to update and share their patches against this branch.  For a full list
 of changes please see the Changelog file.
 
+
+
 * 0.5.9 May 11, 2012
 
 General notes
@@ -213,3 +215,20 @@ security issues that have been brought to our attention. Among other
 Distributors and system integrators are encouraged
 to update and share their patches against this branch.  For a full list
 of changes please see the Changelog file.
+
+
+
+* 0.5.10 Jun 09, 2012
+
+General notes
+-------------
+
+This mostly maintenance-only release addresses a number a number of bugs
+such as security and compilation issues that have been brought to our
+attention. Among other fixes, this release features includes security
+updates for the DPCM codecs (CVE-2011-3951), H.264 (CVE-2012-0851),
+ADPCM (CVE-2012-0852), and the KMVC decoder (CVE-2011-3952).
+
+Distributors and system integrators are encouraged
+to update and share their patches against this branch.  For a full list
+of changes please see the Changelog file or the git commit history.