diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-23 21:29:35 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-23 21:29:35 +0100 |
commit | cce8f750d91c013da00f5191ad537450172acc0c (patch) | |
tree | e8ba8fb8901094137b9f3f815c2789a1d07ae59f /libavformat/jvdec.c | |
parent | 92ec34707ff565980977cf5d7ea4d23bd16b3e28 (diff) | |
parent | 061c489895d29049a88dc6118e4b639a273b31d6 (diff) | |
download | ffmpeg-cce8f750d91c013da00f5191ad537450172acc0c.tar.gz |
Merge commit '061c489895d29049a88dc6118e4b639a273b31d6'
* commit '061c489895d29049a88dc6118e4b639a273b31d6':
eamad: check for out of bounds read
Conflicts:
libavcodec/eamad.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/jvdec.c')
0 files changed, 0 insertions, 0 deletions