]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit 'd6eac2f1bcce0cb85fac5d50fcfe94bc490d4a5e'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Feb 2014 19:57:32 +0000 (20:57 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Feb 2014 19:57:55 +0000 (20:57 +0100)
* commit 'd6eac2f1bcce0cb85fac5d50fcfe94bc490d4a5e':
  arm: Remove a stray .fpu directive

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

Simple merge