diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-22 23:02:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-22 23:08:22 +0100 |
| commit | 9333bba6ed3212ac14aa5e578f8ae8ad279b36c3 (patch) | |
| tree | 3066f8b983433ffc4860b94034e4a7b3905cf476 /libavcodec/x86/h264_qpel.c | |
| parent | 77bc34297596476c1644a497615038d18eed63fe (diff) | |
| parent | 6655c933a887a2d20707fff657b614aa1d86a25b (diff) | |
Merge commit '6655c933a887a2d20707fff657b614aa1d86a25b'
* commit '6655c933a887a2d20707fff657b614aa1d86a25b':
x86: dsputil: Move fpel declarations to a separate header
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/h264_qpel.c')
| -rw-r--r-- | libavcodec/x86/h264_qpel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/x86/h264_qpel.c b/libavcodec/x86/h264_qpel.c index 3422fd1897..a051b12b07 100644 --- a/libavcodec/x86/h264_qpel.c +++ b/libavcodec/x86/h264_qpel.c @@ -26,7 +26,7 @@ #include "libavcodec/h264qpel.h" #include "libavcodec/mpegvideo.h" #include "libavcodec/pixels.h" -#include "dsputil_x86.h" +#include "fpel.h" #if HAVE_YASM void ff_put_pixels4_mmxext(uint8_t *block, const uint8_t *pixels, |