Merge commit 'b7b932f5'

* commit 'b7b932f5':
  arm: Remove a leftover define for the pld instruction
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/arm/dsputil_arm.S

@@ -22,10 +22,6 @@
 #include "config.h"
 #include "libavutil/arm/asm.S"
 
-#if !HAVE_ARMV5TE_EXTERNAL
-#define pld @
-#endif
-
         .align 5
 @ void ff_add_pixels_clamped_arm(int16_t *block, uint8_t *dest, int stride)
 function ff_add_pixels_clamped_arm, export=1