Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Jan 2014 04:44:51 +0000 (05:44 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Jan 2014 04:44:56 +0000 (05:44 +0100)
commit8be8dddd13f4da6e84a5315f95b4ff97775cee8e
tree1807a226b1b6eaad1f357d83bf7c42fee49f9860
parentedba54630b6f6157802a167d04d4da4c33f52d72
parent952d3187d8eda7067fcd73f1d5f17837fa65eb34
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  arm: Add a missing # as prefix for an immediate constant

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/arm/vp3dsp_neon.S