Merge commit 'c23ce454b3e33634a188d6facfd2b7182af5af93'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 17 Jul 2014 19:55:37 +0000 (21:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 17 Jul 2014 20:07:52 +0000 (22:07 +0200)
commitd6676a16057576e1a0ee66ae89963ec54f632919
tree3a1dd254d3034f02eba26cc4bee75a6f8e723516
parent8e2976860ffc920e31e0c45bb1361ac3a552cae8
parentc23ce454b3e33634a188d6facfd2b7182af5af93
Merge commit 'c23ce454b3e33634a188d6facfd2b7182af5af93'

* commit 'c23ce454b3e33634a188d6facfd2b7182af5af93':
  x86: dsputil: Coalesce all init files

Conflicts:
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_x86.h
libavcodec/x86/motion_est.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/x86/Makefile
libavcodec/x86/dirac_dwt.c
libavcodec/x86/diracdsp_mmx.c
libavcodec/x86/dsputil_init.c
libavcodec/x86/snowdsp.c