Merge commit 'f0389eb777b1ab4291329d4f709098cdfa7384dc'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Aug 2013 14:09:46 +0000 (16:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Aug 2013 14:10:39 +0000 (16:10 +0200)
commite1c3e6277f095a258a3676263202a595c044f57b
tree4e76431ceccf5d8180d1463037f6ac52373dbe75
parent946f080b54b009271937035a71ee24b8b856e340
parentf0389eb777b1ab4291329d4f709098cdfa7384dc
Merge commit 'f0389eb777b1ab4291329d4f709098cdfa7384dc'

* commit 'f0389eb777b1ab4291329d4f709098cdfa7384dc':
  arm: fmtconvert: Split armv6 fmtconvert code off from vfp code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/arm/fmtconvert_init_arm.c
libavcodec/arm/fmtconvert_vfp.S
libavcodec/arm/fmtconvert_vfp_armv6.S