[FFmpeg-cvslog] Merge commit 'dc1b328d0df6e5ad5ff0ca4ae031e08466624f9c'
Michael Niedermayer
git at videolan.org
Mon May 6 20:58:29 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May 6 20:53:37 2013 +0200| [a6e782434a218a51b243c00c2b844b7abb4d4509] | committer: Michael Niedermayer
Merge commit 'dc1b328d0df6e5ad5ff0ca4ae031e08466624f9c'
* commit 'dc1b328d0df6e5ad5ff0ca4ae031e08466624f9c':
x86: hpeldsp: Only compile MMX hpeldsp code if MMX is enabled
Conflicts:
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a6e782434a218a51b243c00c2b844b7abb4d4509
---
More information about the ffmpeg-cvslog
mailing list