[FFmpeg-cvslog] Merge commit 'ce378f0dd0c4e5350b3280e6b3e8d6b46fe4b0a3'
Michael Niedermayer
git at videolan.org
Mon Jan 21 16:34:11 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 21 16:28:04 2013 +0100| [cf4515ecd985aab899f24a6b7d18432001e670fa] | committer: Michael Niedermayer
Merge commit 'ce378f0dd0c4e5350b3280e6b3e8d6b46fe4b0a3'
* commit 'ce378f0dd0c4e5350b3280e6b3e8d6b46fe4b0a3':
fate: Use wmv2 IDCT for wmv2 tests
vorbisdsp: change block_size type from int to intptr_t.
Conflicts:
tests/fate-run.sh
tests/fate/vcodec.mak
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cf4515ecd985aab899f24a6b7d18432001e670fa
---
More information about the ffmpeg-cvslog
mailing list