diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-12 12:02:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-12 12:13:09 +0200 |
| commit | 50a3442120e685963649417a6455ce90cf45b653 (patch) | |
| tree | a0c1b610782fd86e995c36cb5711515f9361f8db | |
| parent | 008ae91bcca7f9bc3ae5d04e92f925b0ab771f07 (diff) | |
| parent | 2e06758479650f6e2a8820c7105f2d193a701175 (diff) | |
| download | ffmpeg-50a3442120e685963649417a6455ce90cf45b653.tar.gz | |
Merge commit '2e06758479650f6e2a8820c7105f2d193a701175' into release/1.1
* commit '2e06758479650f6e2a8820c7105f2d193a701175':
Prepare for 9.5 Release
update Changelog
add missed CVE reference in 9.2 release
fate: fetch samples that match the release series
Conflicts:
Changelog
RELEASE
tests/Makefile
The rsync change is not merged
We need to maintain the ability to checkout and test old revissions
from master. This implies that the default sample repository has the
needed samples for both older and newer revissions. Thus there is no
need for a seperate one for each release.
Comments & Suggestions of course welcome
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | Changelog | 23 |
1 files changed, 22 insertions, 1 deletions
@@ -2,6 +2,27 @@ Entries are sorted chronologically from oldest to youngest within each release, releases are sorted from youngest to oldest. version <next>: +- atrac3: avoid oversized shifting in decode_bytes() +- eamad: allocate a dummy reference frame when the real one is missing +- ffv1: fix calculating slice dimensions for version 2 +- flacdec: simplify bounds checking in flac_probe() +- h264: check for luma and chroma bit dept being equal (CVE-2013-2277) +- hqdn3d: Fix out of array read in LOWPASS +- iff: validate CMAP palette size (CVE-2013-2495) +- ivi_common: do not call MC for intra frames when dc_transform is unset +- libmp3lame: use the correct remaining buffer size when flushing +- lzo: fix overflow checking in copy_backptr() +- mp3dec: Fix VBR bit rate parsing +- png: use av_mallocz_array() for the zlib zalloc function +- roqvideodec: fix a potential infinite loop in roqvideo_decode_frame() +- shorten: fix various programming mistakes +- vf_gradfun: fix uninitialized variable use +- vf_hqdn3d: fix uninitialized variable use +- vmdaudio: fix invalid reads when packet size is not a multiple of chunk size +- wmadec: require block_align to be set +- wmaprodec: require block_align to be set +- wmaprodec: return an error, not 0, when the input is too small +- xxan: fix invalid memory access in xan_decode_frame_type0() - h264: fix deadlocks with broken/fuzzed files - flvdec: make decoder more robust - vorbisdec: fix buffer overflow (CVE-2013-0894) @@ -26,7 +47,7 @@ version <next>: - libopencore-amr: Conditionally compile decoder and encoder bits - arm: Fall back to runtime cpu feature detection via /proc/cpuinfo - xxan: properly handle odd heights -- msrledec: check bounds before constructing a possibly invalid pointer, +- msrledec: check bounds before constructing a possibly invalid pointer (CVE-2496) - qtrle: fix the topmost line for 1bit - aasc: fix output for msrle compression - yop: check for input overreads |