[FFmpeg-cvslog] Merge commit '6369ba3c9cc74becfaad2a8882dff3dd3e7ae3c0'
Michael Niedermayer
git at videolan.org
Fri Aug 30 12:48:16 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug 30 12:08:28 2013 +0200| [8be0e2bd43d99833c22dd6ce2958b699f9d5a3aa] | committer: Michael Niedermayer
Merge commit '6369ba3c9cc74becfaad2a8882dff3dd3e7ae3c0'
* commit '6369ba3c9cc74becfaad2a8882dff3dd3e7ae3c0':
x86: avcodec: Use convenience macros to check for CPU flags
Conflicts:
libavcodec/x86/dsputil_init.c
libavcodec/x86/hpeldsp_init.c
libavcodec/x86/motion_est.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8be0e2bd43d99833c22dd6ce2958b699f9d5a3aa
---
More information about the ffmpeg-cvslog
mailing list