Merge commit '79fce1ec8abd017593c003917fc123f7119a78d6'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 8 Jul 2014 12:44:12 +0000 (14:44 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 8 Jul 2014 12:44:12 +0000 (14:44 +0200)
commit1f935c3d0b8ca8659974afc02ebdf058dd99cd9c
tree664caa74714de97934cc1937d3d215baf9a8cf8a
parent70b423e1484f178c40f04b6040349a08aff31f96
parent79fce1ec8abd017593c003917fc123f7119a78d6
Merge commit '79fce1ec8abd017593c003917fc123f7119a78d6'

* commit '79fce1ec8abd017593c003917fc123f7119a78d6':
  arm: Avoid using the 'setend' instruction on ARMv7 and newer

Conflicts:
libavcodec/arm/h264dsp_init_arm.c

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