diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-27 17:48:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-27 17:54:01 +0200 |
| commit | fd85d031626bf1b6af12b4b5444e53c3bb614e3e (patch) | |
| tree | 1ad817e1e80264d9a18f4d7c8a6e4eeddc24cc86 /libavcodec/msgsmdec.c | |
| parent | 9b89041a86a4eccc1ffe50e7857b2d5c1c5fe8b4 (diff) | |
| parent | fbbe487b1c1f21339cff9ca86c3dfc495ad1c2c6 (diff) | |
| download | ffmpeg-fd85d031626bf1b6af12b4b5444e53c3bb614e3e.tar.gz | |
Merge commit 'fbbe487b1c1f21339cff9ca86c3dfc495ad1c2c6' into release/1.1
* commit 'fbbe487b1c1f21339cff9ca86c3dfc495ad1c2c6':
indeo: Sanitize ff_ivi_init_planes fail paths
indeo5: return proper error codes
indeo: Bound-check before applying motion compensation
indeo: Bound-check before applying transform
indeo4: Validate scantable dimension
indeo4: Check the quantization matrix index
indeo4: Do not access missing reference MV
ac3dec: Increment channel pointers only once per channel
dca: Respect the current limits in the downmixing capabilities
dca: Error out on missing DSYNC
pcm: always use codec->id instead of codec_id
mlpdec: Do not set invalid context in read_restart_header
pcx: Do not overread source buffer in pcx_rle_decode
wmavoice: conceal clearly corrupted blocks
iff: Do not read over the source buffer
qdm2: Conceal broken samples
qdm2: refactor joined stereo support
Conflicts:
libavcodec/ac3dec.c
libavcodec/dcadec.c
libavcodec/iff.c
libavcodec/indeo4.c
libavcodec/indeo5.c
libavcodec/ivi_common.c
libavcodec/mlpdec.c
libavcodec/pcx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/msgsmdec.c')
0 files changed, 0 insertions, 0 deletions