[FFmpeg-cvslog] Merge commit '218aefce4472dc02ee3f12830a9a894bf7916da9'
Michael Niedermayer
git at videolan.org
Sat Feb 9 14:40:31 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Feb 9 14:33:57 2013 +0100| [6b2e65078c02cb1e09b555603a1eb10ddb3bd244] | committer: Michael Niedermayer
Merge commit '218aefce4472dc02ee3f12830a9a894bf7916da9'
* commit '218aefce4472dc02ee3f12830a9a894bf7916da9':
dsputil: Move LOCAL_ALIGNED macros to libavutil
Conflicts:
libavcodec/dvdec.c
libavcodec/imc.c
libavcodec/mpegvideo_motion.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6b2e65078c02cb1e09b555603a1eb10ddb3bd244
---
More information about the ffmpeg-cvslog
mailing list