Merge commit '1a8d0cf77ed2611e542ae98f341d4c43a04467bd'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Mar 2014 21:11:17 +0000 (22:11 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Mar 2014 21:11:27 +0000 (22:11 +0100)
commit8fbc6e59118d2cc10a712ea8de0e10d2d984bcee
tree1ea018de258d81f5842ac0abd981c32c05c5a8fc
parent32da2fd422651f1f36f26975685cb7f7ff5a678b
parent1a8d0cf77ed2611e542ae98f341d4c43a04467bd
Merge commit '1a8d0cf77ed2611e542ae98f341d4c43a04467bd'

* commit '1a8d0cf77ed2611e542ae98f341d4c43a04467bd':
  x86: dsputil: Move inline assembly macros to a separate header

Conflicts:
libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_qns_template.c
libavcodec/x86/dsputil_x86.h
libavcodec/x86/fpel_mmx.c
libavcodec/x86/hpeldsp_mmx.c
libavcodec/x86/inline_asm.h
libavcodec/x86/rnd_mmx.c
libavcodec/x86/rnd_template.c