OSDN Git Service

Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 21 Aug 2013 11:08:49 +0000 (13:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 21 Aug 2013 11:08:55 +0000 (13:08 +0200)
commit3d842cf8273f4f67eed410d0cfe015010963fea9
tree46fe81a82107f230ea6b4275ef4080aff21f4f38
parent70a73213b787268b9fdfc92ed418ad9802992b10
parente95930eda18e90eaea30fd397ea21b30f7763137
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avcodec/utils: Simplify a condition that combines HAVE_NEON and ARCH_ARM

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/utils.c