Commit 3c00d4c5 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'b7b932f5'

* commit 'b7b932f5':
  arm: Remove a leftover define for the pld instruction
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 9ef7c0c5 b7b932f5
...@@ -22,10 +22,6 @@ ...@@ -22,10 +22,6 @@
#include "config.h" #include "config.h"
#include "libavutil/arm/asm.S" #include "libavutil/arm/asm.S"
#if !HAVE_ARMV5TE_EXTERNAL
#define pld @
#endif
.align 5 .align 5
@ void ff_add_pixels_clamped_arm(int16_t *block, uint8_t *dest, int stride) @ void ff_add_pixels_clamped_arm(int16_t *block, uint8_t *dest, int stride)
function ff_add_pixels_clamped_arm, export=1 function ff_add_pixels_clamped_arm, export=1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment