Merge commit '6369ba3c9cc74becfaad2a8882dff3dd3e7ae3c0'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 30 Aug 2013 10:08:28 +0000 (12:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 30 Aug 2013 10:08:28 +0000 (12:08 +0200)
commit8be0e2bd43d99833c22dd6ce2958b699f9d5a3aa
treed7d3e4e39bab16e8a41ccd308e7cbf658206e5c8
parentf0a35623826e367fb1534c68222bfd4918e58a0f
parent6369ba3c9cc74becfaad2a8882dff3dd3e7ae3c0
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@gmx.at>
libavcodec/x86/cavsdsp.c
libavcodec/x86/dnxhdenc.c
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputilenc_mmx.c
libavcodec/x86/hpeldsp_init.c
libavcodec/x86/lpc.c
libavcodec/x86/motion_est.c
libavcodec/x86/mpegvideo.c
libavcodec/x86/videodsp_init.c
libavcodec/x86/vorbisdsp_init.c
libavcodec/x86/vp8dsp_init.c