diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-12 04:35:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-12 04:35:06 +0100 |
| commit | 1c27359867cfd6b3a8f0d3d03144f183ccda694b (patch) | |
| tree | cd72985372a9e203b051b382c0c35e5d569e3b2f /libswresample | |
| parent | 00969376cefda9c733217bff139f911c24b16deb (diff) | |
| parent | c95fefa0420be9cc0f09a95041acf11114aaacd0 (diff) | |
| download | ffmpeg-1c27359867cfd6b3a8f0d3d03144f183ccda694b.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dsicinvideo: validate buffer offset before copying pixels.
cook: error out on quant_index values outside [-63, 63] range.
mpc: pad mpc_CC/SCF[] tables to allow for negative indices.
Conflicts:
libavcodec/cook.c
libavcodec/dsicinav.c
libavcodec/mpc.c
libavcodec/mpc7.c
libavcodec/mpcdata.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample')
0 files changed, 0 insertions, 0 deletions