[FFmpeg-cvslog] Merge commit '12f129e545e5a5844b6ad7f3eb6a438015cad8bc'
Michael Niedermayer
git at videolan.org
Sat Jul 5 20:11:42 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jul 5 19:19:22 2014 +0200| [5036c8b17b29623cd86b514474d1c0a81acf1e13] | committer: Michael Niedermayer
Merge commit '12f129e545e5a5844b6ad7f3eb6a438015cad8bc'
* commit '12f129e545e5a5844b6ad7f3eb6a438015cad8bc':
x86: Unconditionally compile blockdsp and svq1enc init files
Conflicts:
libavcodec/x86/Makefile
blockdsp_mmx is renamed to blockdsp_init as we already have a blockdsp file
and _init is how all other such files are called
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5036c8b17b29623cd86b514474d1c0a81acf1e13
---
More information about the ffmpeg-cvslog
mailing list