[FFmpeg-cvslog] Merge commit '9e5e76ef9ea803432ef2782a3f528c3f5bab621e'
Michael Niedermayer
git at videolan.org
Mon May 6 20:52:21 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May 6 20:46:27 2013 +0200| [32cc7dacde6d4970719cb59ec58ec48f64291ee9] | committer: Michael Niedermayer
Merge commit '9e5e76ef9ea803432ef2782a3f528c3f5bab621e'
* commit '9e5e76ef9ea803432ef2782a3f528c3f5bab621e':
x86: More specific ifdefs for dsputil/hpeldsp init functions
Conflicts:
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=32cc7dacde6d4970719cb59ec58ec48f64291ee9
---
More information about the ffmpeg-cvslog
mailing list