diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-10 13:45:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-10 13:45:40 +0100 |
| commit | 396b47d2a71797e77ad22567b5f2f1ac9874ee51 (patch) | |
| tree | 6efb0f071633b7ea003b2f6fce546014143d0111 /libavformat/utils.c | |
| parent | dec5586bc7340e4aeca86f22c64846767814a8f2 (diff) | |
| parent | c17da32ba26d2c333bd9cd4afe38a1b36e3d6cba (diff) | |
| download | ffmpeg-396b47d2a71797e77ad22567b5f2f1ac9874ee51.tar.gz | |
Merge commit 'c17da32ba26d2c333bd9cd4afe38a1b36e3d6cba' into release/1.1
* commit 'c17da32ba26d2c333bd9cd4afe38a1b36e3d6cba':
eamad: check for out of bounds read
Conflicts:
libavcodec/eamad.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/utils.c')
0 files changed, 0 insertions, 0 deletions