diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-12 16:57:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-12 17:06:54 +0100 |
| commit | 9b89824f20223c6e84c897540456642211d54e7e (patch) | |
| tree | eee37f3280b03504e69abc0cf7c7f9a49129cf3b /libavcodec/mjpegdec.h | |
| parent | f479c178943fdaee5f8d92f88658c57bec3e40b3 (diff) | |
| parent | a0866c71293db80f271f11176eae72217d773e9a (diff) | |
| download | ffmpeg-9b89824f20223c6e84c897540456642211d54e7e.tar.gz | |
Merge remote-tracking branch 'qatar/release/9' into release/1.1
* qatar/release/9:
shorten: Fix out-of-array read
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpegdec.h')
0 files changed, 0 insertions, 0 deletions