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)
* qatar/master:
  arm: Add a missing # as prefix for an immediate constant

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

Simple merge