Update or 2.5.6

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

3 files changed, 24 insertions, 2 deletions

diff --git a/Changelog b/Changelog
index d8755304df..0ca400c1f6 100644
--- a/Changelog
+++ b/Changelog
@@ -1,6 +1,28 @@
 Entries are sorted chronologically from oldest to youngest within each release,
 releases are sorted from youngest to oldest.
 
+version 2.5.6
+- avcodec/atrac3plusdsp: fix on stack alignment
+- ac3: validate end in ff_ac3_bit_alloc_calc_mask
+- aacpsy: avoid psy_band->threshold becoming NaN
+- aasc: return correct buffer size from aasc_decode_frame
+- msrledec: use signed pixel_ptr in msrle_decode_pal4
+- swresample: Allow reinitialization without ever setting channel layouts (cherry picked from commit 80a28c7509a11114e1aea5b208d56c6646d69c07)
+- swresample: Allow reinitialization without ever setting channel counts
+- avcodec/h264: Do not fail with randomly truncated VUIs
+- avcodec/h264_ps: Move truncation check from VUI to SPS
+- avcodec/h264: Be more tolerant to changing pps id between slices
+- avcodec/aacdec: Fix storing state before PCE decode
+- avcodec/h264: reset the counts in the correct context
+- avcodec/h264_slice: Do not reset mb_aff_frame per slice
+- avcodec/h264: finish previous slices before switching to single thread mode
+- avcodec/h264: Fix race between slices where one overwrites data from the next
+- avcodec/h264_refs: Do not set reference to things which do not exist
+- avcodec/h264: Fail for invalid mixed IDR / non IDR frames in slice threading mode
+- h264: avoid unnecessary calls to get_format
+- avcodec/msrledec: restructure msrle_decode_pal4() based on the line number instead of the pixel pointer
+
+
 version 2.5.5:
 - vp9: make above buffer pointer 32-byte aligned.
 - avcodec/dnxhddec: Check that the frame is interlaced before using cur_field
diff --git a/RELEASE b/RELEASE
index 0cadbc1e33..da6b0a8f16 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1 @@
-2.5.5
+2.5.6
diff --git a/doc/Doxyfile b/doc/Doxyfile
index 6d75bb961c..3a35d9c3ba 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.5.5
+PROJECT_NUMBER         = 2.5.6
 
 # 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