Merge commit '82dd1026cfc1d72b04019185bea4c1c9621ace3f'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Mar 2014 22:21:54 +0000 (23:21 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Mar 2014 22:21:54 +0000 (23:21 +0100)
commit74fed968d1b6f0aec9c08b9ac4fcad4314e0460a
treee71ce5a64ad6d1c6287915220e11698aeed8d2f1
parent816d7936a714b050a86cd376c9dd0c175a6fd9fa
parent82dd1026cfc1d72b04019185bea4c1c9621ace3f
Merge commit '82dd1026cfc1d72b04019185bea4c1c9621ace3f'

* commit '82dd1026cfc1d72b04019185bea4c1c9621ace3f':
  x86: dsputil: Move hpeldsp-related declarations to a separate header

Conflicts:
libavcodec/x86/dsputil_x86.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/x86/dsputil_x86.h
libavcodec/x86/hpeldsp.h
libavcodec/x86/hpeldsp_init.c
libavcodec/x86/hpeldsp_mmx.c
libavcodec/x86/rnd_mmx.c
libavcodec/x86/rv40dsp_init.c