diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-03 00:40:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-03 00:40:23 +0200 |
| commit | 683cbbb72142069aa34ce7065ac8c41caa3ddb6d (patch) | |
| tree | 284b516aa071abfa5ac28ba5419b7b2b9a12a5fb /tests/Makefile | |
| parent | cff8d01e15174aeafa91158ccb7576f9a607d1bf (diff) | |
| parent | 10f77c165c3b3e881bb174a0f57dd62083639072 (diff) | |
| download | ffmpeg-683cbbb72142069aa34ce7065ac8c41caa3ddb6d.tar.gz | |
Merge commit '10f77c165c3b3e881bb174a0f57dd62083639072' into release/1.1
* commit '10f77c165c3b3e881bb174a0f57dd62083639072':
pixdesc: mark gray8 as pseudopal
mjpegdec: validate parameters in mjpeg_decode_scan_progressive_ac
mjpeg: Validate sampling factors
ljpeg: use the correct number of components in yuv
wavpack: validate samples size parsed in wavpack_decode_block
Conflicts:
libavcodec/mjpegdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/Makefile')
0 files changed, 0 insertions, 0 deletions