6869612f5c
* commit '6869612f5c': arm: Macroize the test for 'setend' CPU instruction support Conflicts: libavcodec/arm/h264dsp_init_arm.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
d5a5598198
637606de2d
7b0c7c9163
7ffda66fd5
831a118078