Merge commit '896a5bff64264f4d01ed98eacc97a67260c1e17e'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Jun 2014 16:19:21 +0000 (18:19 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Jun 2014 16:19:21 +0000 (18:19 +0200)
commit83e8650f7703b47d9762d9ef0e520b67f92b5aba
tree1a22542120bd137455cd54f25c761bc58c06c330
parentbcbd7dbce5461ba91ab2179737f916b374572a2e
parent896a5bff64264f4d01ed98eacc97a67260c1e17e
Merge commit '896a5bff64264f4d01ed98eacc97a67260c1e17e'

* commit '896a5bff64264f4d01ed98eacc97a67260c1e17e':
  arm: check if AS supports .dn

Conflicts:
configure
libavcodec/arm/vc1dsp_init_neon.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
libavcodec/arm/vc1dsp_init_neon.c
libavcodec/arm/vc1dsp_neon.S