Merge commit '9fa9d471a7af57a62843fdae0dc36e67960c3f3d' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Mar 2015 20:10:27 +0000 (21:10 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Mar 2015 20:10:31 +0000 (21:10 +0100)
commit6a28ae55c4fea975c09a3474ca5a55ca4134a4e9
treeb915f2e50b8e2b0af1b3f0dd88e8e154ebd73286
parent78518fb928400e208ae51d8bacb27ad49ab9ad15
parent9fa9d471a7af57a62843fdae0dc36e67960c3f3d
Merge commit '9fa9d471a7af57a62843fdae0dc36e67960c3f3d' into release/0.10

* commit '9fa9d471a7af57a62843fdae0dc36e67960c3f3d':
  arm: dsputil: prettify some conditional instructions in put_pixels macros

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