diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-05 19:04:56 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-05 19:05:00 +0200 |
commit | 874f27a8f7e3ca2169c28746173c0a92659beb9c (patch) | |
tree | 8e432156370188366bc90193c2c95c5c69c7e3c0 /libavcodec | |
parent | 5440151fa42d4e18c83bc42ff31526680697e645 (diff) | |
parent | b42f49e42f8cde25a788b2d13d03e99ca2956647 (diff) | |
download | ffmpeg-874f27a8f7e3ca2169c28746173c0a92659beb9c.tar.gz |
Merge commit 'b42f49e42f8cde25a788b2d13d03e99ca2956647'
* commit 'b42f49e42f8cde25a788b2d13d03e99ca2956647':
x86: dsputil: Eliminate some unnecessary dsputil_x86.h #includes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/x86/ac3dsp_init.c | 1 | ||||
-rw-r--r-- | libavcodec/x86/h264dsp_init.c | 1 | ||||
-rw-r--r-- | libavcodec/x86/mpegvideo.c | 1 | ||||
-rw-r--r-- | libavcodec/x86/mpegvideoenc.c | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/libavcodec/x86/ac3dsp_init.c b/libavcodec/x86/ac3dsp_init.c index 6936ace87b..30a85f996e 100644 --- a/libavcodec/x86/ac3dsp_init.c +++ b/libavcodec/x86/ac3dsp_init.c @@ -23,7 +23,6 @@ #include "libavutil/mem.h" #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" -#include "dsputil_x86.h" #include "libavcodec/ac3.h" #include "libavcodec/ac3dsp.h" diff --git a/libavcodec/x86/h264dsp_init.c b/libavcodec/x86/h264dsp_init.c index ae449e7e57..311df5f856 100644 --- a/libavcodec/x86/h264dsp_init.c +++ b/libavcodec/x86/h264dsp_init.c @@ -23,7 +23,6 @@ #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" #include "libavcodec/h264dsp.h" -#include "dsputil_x86.h" /***********************************/ /* IDCT */ diff --git a/libavcodec/x86/mpegvideo.c b/libavcodec/x86/mpegvideo.c index b2ce68062c..9353a82933 100644 --- a/libavcodec/x86/mpegvideo.c +++ b/libavcodec/x86/mpegvideo.c @@ -25,7 +25,6 @@ #include "libavutil/x86/cpu.h" #include "libavcodec/avcodec.h" #include "libavcodec/mpegvideo.h" -#include "dsputil_x86.h" #if HAVE_MMX_INLINE diff --git a/libavcodec/x86/mpegvideoenc.c b/libavcodec/x86/mpegvideoenc.c index 7dd9959087..e24e5a6e93 100644 --- a/libavcodec/x86/mpegvideoenc.c +++ b/libavcodec/x86/mpegvideoenc.c @@ -26,7 +26,6 @@ #include "libavcodec/avcodec.h" #include "libavcodec/dct.h" #include "libavcodec/mpegvideo.h" -#include "dsputil_x86.h" /* not permutated inverse zigzag_direct + 1 for MMX quantizer */ DECLARE_ALIGNED(16, static uint16_t, inv_zigzag_direct16)[64]; |