Merge commit 'acf91215c74a91eb3b86af01dcb1d3c78d0e2310'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Jul 2014 19:37:47 +0000 (21:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Jul 2014 19:51:20 +0000 (21:51 +0200)
commitcc3e7a4c3df9f6de6f4a2f312355dc221d6380f0
treeb1da90fbc7cb5013fabacba7364f99e5e9403d0c
parent98227ba5fa456b5dacd404e125420c9abf87ff95
parentacf91215c74a91eb3b86af01dcb1d3c78d0e2310
Merge commit 'acf91215c74a91eb3b86af01dcb1d3c78d0e2310'

* commit 'acf91215c74a91eb3b86af01dcb1d3c78d0e2310':
  x86: dsputil: Avoid pointless CONFIG_ENCODERS indirection

Conflicts:
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputilenc_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/x86/Makefile
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_x86.h