Merge commit '6869612f5c7d4d2f20f69a5658328a761deadb1c'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Jul 2014 10:46:13 +0000 (12:46 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Jul 2014 10:46:13 +0000 (12:46 +0200)
commit7cdb3b2b79d78b7b3e686b3a53e904b4656d461f
tree385b6b788702258652331c138d1e9717087e4253
parent135ea609cebb5a5d331a2550caebe161d163c190
parent6869612f5c7d4d2f20f69a5658328a761deadb1c
Merge commit '6869612f5c7d4d2f20f69a5658328a761deadb1c'

* commit '6869612f5c7d4d2f20f69a5658328a761deadb1c':
  arm: Macroize the test for 'setend' CPU instruction support

Conflicts:
libavcodec/arm/h264dsp_init_arm.c

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