diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-21 10:49:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-21 10:50:03 +0200 |
| commit | f57a7ac9b8e0e55e3722ea82c084ff7d7dc2b2fd (patch) | |
| tree | f2bbe85f6038dc86431bc21873119ab62aa68708 /libavcodec/g722enc.c | |
| parent | 5a65fea655fb2558a3004a93f782c1534dd6a363 (diff) | |
| parent | 8aa3500905fec6c4e657bb291b861d43c34d3de9 (diff) | |
| download | ffmpeg-f57a7ac9b8e0e55e3722ea82c084ff7d7dc2b2fd.tar.gz | |
Merge commit '8aa3500905fec6c4e657bb291b861d43c34d3de9'
* commit '8aa3500905fec6c4e657bb291b861d43c34d3de9':
mjpeg: Validate sampling factors
Conflicts:
libavcodec/mjpegdec.c
See: 08c37a10e9ef7e30d7b7a889ad28c7fa9c49c886
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g722enc.c')
0 files changed, 0 insertions, 0 deletions