Merge commit 'b8e57113ecba5494d4bf47c29634392ea5fdb17b' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Jul 2014 18:18:14 +0000 (20:18 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Jul 2014 18:18:14 +0000 (20:18 +0200)
* commit 'b8e57113ecba5494d4bf47c29634392ea5fdb17b':
  arm: Avoid using the 'setend' instruction on ARMv7 and newer

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

Simple merge