Merge commit '12f129e545e5a5844b6ad7f3eb6a438015cad8bc'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 5 Jul 2014 17:19:22 +0000 (19:19 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 5 Jul 2014 17:50:05 +0000 (19:50 +0200)
commit5036c8b17b29623cd86b514474d1c0a81acf1e13
tree9c1c36326fbf1a9058b1da6bc999f50588064a0b
parentd5601cf6fc1c1606ec45466d5d72fd1e60a4ba3b
parent12f129e545e5a5844b6ad7f3eb6a438015cad8bc
Merge commit '12f129e545e5a5844b6ad7f3eb6a438015cad8bc'

* commit '12f129e545e5a5844b6ad7f3eb6a438015cad8bc':
  x86: Unconditionally compile blockdsp and svq1enc init files

Conflicts:
libavcodec/x86/Makefile

blockdsp_mmx is renamed to blockdsp_init as we already have a blockdsp file
and _init is how all other such files are called

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/x86/Makefile
libavcodec/x86/blockdsp_init.c
libavcodec/x86/svq1enc.c