diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-09 14:42:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-09 14:45:45 +0100 |
| commit | 5cfc0ae825e675ca9f629dfedac174477fc471e8 (patch) | |
| tree | 32fafde3f65eb99cc965171a74694c03554b4302 /libavcodec/x86 | |
| parent | 6b2e65078c02cb1e09b555603a1eb10ddb3bd244 (diff) | |
| parent | 5d3d39c72e57dca76c508a1c28036f8a2c1d8ad8 (diff) | |
| download | ffmpeg-5cfc0ae825e675ca9f629dfedac174477fc471e8.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dsputil: Move fdct function declarations to dct.h
Conflicts:
libavcodec/dsputil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86')
| -rw-r--r-- | libavcodec/x86/dsputilenc_mmx.c | 1 | ||||
| -rw-r--r-- | libavcodec/x86/fdct.c | 2 | ||||
| -rw-r--r-- | libavcodec/x86/mpegvideoenc.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/x86/dsputilenc_mmx.c b/libavcodec/x86/dsputilenc_mmx.c index 25df5d91a7..a3f268e7a8 100644 --- a/libavcodec/x86/dsputilenc_mmx.c +++ b/libavcodec/x86/dsputilenc_mmx.c @@ -26,6 +26,7 @@ #include "libavutil/cpu.h" #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" +#include "libavcodec/dct.h" #include "libavcodec/dsputil.h" #include "libavcodec/mpegvideo.h" #include "libavcodec/mathops.h" diff --git a/libavcodec/x86/fdct.c b/libavcodec/x86/fdct.c index 44a3d7cbe8..d35245dbbe 100644 --- a/libavcodec/x86/fdct.c +++ b/libavcodec/x86/fdct.c @@ -32,7 +32,7 @@ #include "libavutil/common.h" #include "libavutil/x86/asm.h" -#include "libavcodec/dsputil.h" +#include "libavcodec/dct.h" #if HAVE_INLINE_ASM diff --git a/libavcodec/x86/mpegvideoenc.c b/libavcodec/x86/mpegvideoenc.c index d6922bb983..6219667af3 100644 --- a/libavcodec/x86/mpegvideoenc.c +++ b/libavcodec/x86/mpegvideoenc.c @@ -24,7 +24,7 @@ #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" #include "libavcodec/avcodec.h" -#include "libavcodec/dsputil.h" +#include "libavcodec/dct.h" #include "libavcodec/mpegvideo.h" #include "dsputil_mmx.h" |