[FFmpeg-cvslog] Merge commit 'a519583991c38d38503ab08357716513facc5725'
Michael Niedermayer
git at videolan.org
Thu Aug 29 14:48:50 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug 29 14:38:51 2013 +0200| [db6b389c7f2176487cc4622a18f58e6b10af8e99] | committer: Michael Niedermayer
Merge commit 'a519583991c38d38503ab08357716513facc5725'
* commit 'a519583991c38d38503ab08357716513facc5725':
swscale: x86: Hide arch-specific initialization details
Conflicts:
libswscale/x86/Makefile
libswscale/x86/swscale.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=db6b389c7f2176487cc4622a18f58e6b10af8e99
---
More information about the ffmpeg-cvslog
mailing list