diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-08 05:21:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-08 05:21:18 +0100 |
| commit | 3c00d4c5f0ae855981a0cf8addfae0c948414625 (patch) | |
| tree | 2ed15013f314aebe48fed2700234f2a1f89329af /libavcodec/arm/dsputil_arm.S | |
| parent | 9ef7c0c5510fb79c44291cc57c490fbb7f70f998 (diff) | |
| parent | b7b932f5e3602bd34c3cc634b71c8bbbc0fb8dc0 (diff) | |
| download | ffmpeg-3c00d4c5f0ae855981a0cf8addfae0c948414625.tar.gz | |
Merge commit 'b7b932f5e3602bd34c3cc634b71c8bbbc0fb8dc0'
* commit 'b7b932f5e3602bd34c3cc634b71c8bbbc0fb8dc0':
arm: Remove a leftover define for the pld instruction
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/dsputil_arm.S')
| -rw-r--r-- | libavcodec/arm/dsputil_arm.S | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavcodec/arm/dsputil_arm.S b/libavcodec/arm/dsputil_arm.S index 586a833fc1..cd0acc05c8 100644 --- a/libavcodec/arm/dsputil_arm.S +++ b/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 |