diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-05 12:23:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-05 12:26:25 +0200 |
| commit | 9f89bebb7bffc3c2f3c7b0b80ab59a0b9d6d09b1 (patch) | |
| tree | 3c34ef29eb415aabf13986c20a3e57b096b135b9 /libavcodec/flac.c | |
| parent | 7d3b55c6a427a33f44e3d512c5866eebe5df7915 (diff) | |
| parent | 6a10142faa1cca8ba2bfe51b970754f62d60f320 (diff) | |
| download | ffmpeg-9f89bebb7bffc3c2f3c7b0b80ab59a0b9d6d09b1.tar.gz | |
Merge commit '6a10142faa1cca8ba2bfe51b970754f62d60f320'
* commit '6a10142faa1cca8ba2bfe51b970754f62d60f320':
indeo: reject negative array indexes
Conflicts:
libavcodec/ivi_common.c
See: 93927eb334dce961603645dd4ed9772bb2400cc4, a93c7ca6ef625188c9ec088c2e75f731b78c9923
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/flac.c')
0 files changed, 0 insertions, 0 deletions