Merge commit '6655c933a887a2d20707fff657b614aa1d86a25b'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Mar 2014 22:02:46 +0000 (23:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Mar 2014 22:08:22 +0000 (23:08 +0100)
commit9333bba6ed3212ac14aa5e578f8ae8ad279b36c3
tree3066f8b983433ffc4860b94034e4a7b3905cf476
parent77bc34297596476c1644a497615038d18eed63fe
parent6655c933a887a2d20707fff657b614aa1d86a25b
Merge commit '6655c933a887a2d20707fff657b614aa1d86a25b'

* commit '6655c933a887a2d20707fff657b614aa1d86a25b':
  x86: dsputil: Move fpel declarations to a separate header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/x86/cavsdsp.c
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_x86.h
libavcodec/x86/fpel.h
libavcodec/x86/fpel_mmx.c
libavcodec/x86/h264_qpel.c
libavcodec/x86/hpeldsp_init.c
libavcodec/x86/vc1dsp_mmx.c