[FFmpeg-cvslog] Merge commit '6a10142faa1cca8ba2bfe51b970754f62d60f320'
Michael Niedermayer
git at videolan.org
Fri Jul 5 12:33:00 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul 5 12:23:13 2013 +0200| [9f89bebb7bffc3c2f3c7b0b80ab59a0b9d6d09b1] | committer: Michael Niedermayer
Merge commit '6a10142faa1cca8ba2bfe51b970754f62d60f320'
* commit '6a10142faa1cca8ba2bfe51b970754f62d60f320':
indeo: reject negative array indexes
Conflicts:
libavcodec/ivi_common.c
See: 93927eb334dce961603645dd4ed9772bb2400cc4, a93c7ca6ef625188c9ec088c2e75f731b78c9923
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9f89bebb7bffc3c2f3c7b0b80ab59a0b9d6d09b1
---
More information about the ffmpeg-cvslog
mailing list