diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 13:20:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 13:28:35 +0200 |
| commit | 2e85737b0e0bdc9c4d1e28dd9417370f35f8c62d (patch) | |
| tree | c15cba1a649aa81f059bf5092b40a4d6ed7c2f39 /libavcodec/rangecoder.c | |
| parent | 838bd731393a29a41a86ff15ccf972f967306319 (diff) | |
| parent | d3cb302b88503c3111e25add196622110c056188 (diff) | |
| download | ffmpeg-2e85737b0e0bdc9c4d1e28dd9417370f35f8c62d.tar.gz | |
Merge commit 'd3cb302b88503c3111e25add196622110c056188'
* commit 'd3cb302b88503c3111e25add196622110c056188':
jpeg2000: Validate SOT parsing
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rangecoder.c')
0 files changed, 0 insertions, 0 deletions