aboutsummaryrefslogtreecommitdiffstats
path: root/libswscale/arm
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-06-03 18:19:21 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-06-03 18:19:21 +0200
commit83e8650f7703b47d9762d9ef0e520b67f92b5aba (patch)
tree1a22542120bd137455cd54f25c761bc58c06c330 /libswscale/arm
parentbcbd7dbce5461ba91ab2179737f916b374572a2e (diff)
parent896a5bff64264f4d01ed98eacc97a67260c1e17e (diff)
downloadffmpeg-83e8650f7703b47d9762d9ef0e520b67f92b5aba.tar.gz
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>
Diffstat (limited to 'libswscale/arm')
0 files changed, 0 insertions, 0 deletions