diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-05 20:48:42 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-05 20:54:15 +0400 |
commit | 5440151fa42d4e18c83bc42ff31526680697e645 (patch) | |
tree | 43851c2293c5cc89326ef227674a0f059290e904 /libavcodec/arm | |
parent | a1ac12bddd8ddb184281eadf5431dce29c02f27a (diff) | |
parent | 3dc6272bed7890a49080e18eacf3c7a4a6594b0d (diff) |
Merge commit '3dc6272bed7890a49080e18eacf3c7a4a6594b0d'
* commit '3dc6272bed7890a49080e18eacf3c7a4a6594b0d':
Remove a number of unnecessary dsputil.h #includes
Conflicts:
libavcodec/h264pred.c
libavcodec/vc1dsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm')
-rw-r--r-- | libavcodec/arm/vp3dsp_init_arm.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/arm/vp3dsp_init_arm.c b/libavcodec/arm/vp3dsp_init_arm.c index c8888edc85..d9246365df 100644 --- a/libavcodec/arm/vp3dsp_init_arm.c +++ b/libavcodec/arm/vp3dsp_init_arm.c @@ -21,7 +21,6 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/arm/cpu.h" -#include "libavcodec/dsputil.h" #include "libavcodec/vp3dsp.h" void ff_vp3_idct_put_neon(uint8_t *dest, int line_size, int16_t *data); |