diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 13:57:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 14:19:35 +0200 |
| commit | f0358dc1d30cd4f4862489ab95c4d408b00a8b0d (patch) | |
| tree | 3d57ebc7069de651737d83e5d188eb1291484b9f /libavcodec/rangecoder.c | |
| parent | 2e85737b0e0bdc9c4d1e28dd9417370f35f8c62d (diff) | |
| parent | 278a923c51187d37445d88a6b21082036ec9568d (diff) | |
| download | ffmpeg-f0358dc1d30cd4f4862489ab95c4d408b00a8b0d.tar.gz | |
Merge commit '278a923c51187d37445d88a6b21082036ec9568d'
* commit '278a923c51187d37445d88a6b21082036ec9568d':
jpeg2000: Validate SIZ parsing
Conflicts:
libavcodec/jpeg2000dec.c
This commit is not exactly merged due to bugs in it
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rangecoder.c')
0 files changed, 0 insertions, 0 deletions