[FFmpeg-cvslog] Merge commit '994d8f3095180ba1b2c6040a97718e931a782b34'
Michael Niedermayer
git at videolan.org
Tue Mar 3 21:16:08 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 3 20:54:17 2015 +0100| [b7d3fbc69bb60ab2c1369ac5ba20f23565a4db8d] | committer: Michael Niedermayer
Merge commit '994d8f3095180ba1b2c6040a97718e931a782b34'
* commit '994d8f3095180ba1b2c6040a97718e931a782b34':
fate: Add AIC test with odd sizes
Conflicts:
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b7d3fbc69bb60ab2c1369ac5ba20f23565a4db8d
---
More information about the ffmpeg-cvslog
mailing list