diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-14 12:01:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-14 12:12:20 +0200 |
| commit | a887372109a262263ec04355d30f9834c35ac85f (patch) | |
| tree | c10e27e8e346cc1b7a162887f018776436a519c0 /libavcodec/x86/vc1dsp_mmx.c | |
| parent | b2da63db507b88743edb6bf6675aaf4f9f59edb1 (diff) | |
| parent | 1399931d07f0f37ef4526eb8d39d33c64e09618a (diff) | |
Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a'
* commit '1399931d07f0f37ef4526eb8d39d33c64e09618a':
x86: dsputil: Rename dsputil_mmx.h --> dsputil_x86.h
Conflicts:
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/vc1dsp_mmx.c')
| -rw-r--r-- | libavcodec/x86/vc1dsp_mmx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/x86/vc1dsp_mmx.c b/libavcodec/x86/vc1dsp_mmx.c index c50f779984..5ceacd348e 100644 --- a/libavcodec/x86/vc1dsp_mmx.c +++ b/libavcodec/x86/vc1dsp_mmx.c @@ -30,7 +30,7 @@ #include "libavutil/x86/cpu.h" #include "libavcodec/vc1dsp.h" #include "constants.h" -#include "dsputil_mmx.h" +#include "dsputil_x86.h" #include "vc1dsp.h" #if HAVE_INLINE_ASM |