diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-22 23:21:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-22 23:21:54 +0100 |
| commit | 74fed968d1b6f0aec9c08b9ac4fcad4314e0460a (patch) | |
| tree | e71ce5a64ad6d1c6287915220e11698aeed8d2f1 /libavcodec/x86/hpeldsp_init.c | |
| parent | 816d7936a714b050a86cd376c9dd0c175a6fd9fa (diff) | |
| parent | 82dd1026cfc1d72b04019185bea4c1c9621ace3f (diff) | |
| download | ffmpeg-74fed968d1b6f0aec9c08b9ac4fcad4314e0460a.tar.gz | |
Merge commit '82dd1026cfc1d72b04019185bea4c1c9621ace3f'
* commit '82dd1026cfc1d72b04019185bea4c1c9621ace3f':
x86: dsputil: Move hpeldsp-related declarations to a separate header
Conflicts:
libavcodec/x86/dsputil_x86.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/hpeldsp_init.c')
| -rw-r--r-- | libavcodec/x86/hpeldsp_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/x86/hpeldsp_init.c b/libavcodec/x86/hpeldsp_init.c index 3c9515a3d2..c945c50481 100644 --- a/libavcodec/x86/hpeldsp_init.c +++ b/libavcodec/x86/hpeldsp_init.c @@ -29,8 +29,8 @@ #include "libavcodec/avcodec.h" #include "libavcodec/hpeldsp.h" #include "libavcodec/pixels.h" -#include "dsputil_x86.h" #include "fpel.h" +#include "hpeldsp.h" void ff_put_pixels8_x2_mmxext(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h); |