[FFmpeg-cvslog] Merge commit 'f9e5261cab067be7278f73d515bc9b601eb56202'
Michael Niedermayer
git at videolan.org
Mon Jul 15 14:04:21 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jul 15 13:58:38 2013 +0200| [c4b904caeaa7664870030c3015e1593f90112c9c] | committer: Michael Niedermayer
Merge commit 'f9e5261cab067be7278f73d515bc9b601eb56202'
* commit 'f9e5261cab067be7278f73d515bc9b601eb56202':
indeo: Do not reference mismatched tiles
Conflicts:
libavcodec/ivi_common.c
See: dab70c62d20081bcf879b7b6bc3ffabc2e331542
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c4b904caeaa7664870030c3015e1593f90112c9c
---
More information about the ffmpeg-cvslog
mailing list