From c242bbd8b6939507a1a6fb64101b0553d92d303f Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sat, 23 Feb 2013 20:10:38 +0100 Subject: [PATCH] Remove unnecessary dsputil.h #includes --- libavcodec/aac.h | 1 - libavcodec/aacdec.c | 1 - libavcodec/aacenc.c | 1 - libavcodec/aacenc.h | 1 - libavcodec/aasc.c | 1 - libavcodec/alacenc.c | 1 - libavcodec/alpha/motion_est_alpha.c | 1 - libavcodec/alpha/mpegvideo_alpha.c | 1 - libavcodec/alpha/simple_idct_alpha.c | 1 - libavcodec/arm/dsputil_init_arm.c | 1 - libavcodec/arm/dsputil_init_armv5te.c | 1 - libavcodec/arm/dsputil_init_armv6.c | 1 - libavcodec/arm/dsputil_init_neon.c | 1 - libavcodec/arm/h264dsp_init_arm.c | 1 - libavcodec/arm/mpegvideo_arm.c | 1 - libavcodec/arm/mpegvideo_armv5te.c | 1 - libavcodec/asv.c | 1 - libavcodec/asvdec.c | 1 - libavcodec/atrac.c | 1 - libavcodec/atrac1.c | 1 - libavcodec/bethsoftvideo.c | 2 +- libavcodec/bfin/mpegvideo_bfin.c | 1 - libavcodec/binkaudio.c | 1 - libavcodec/binkdsp.h | 2 +- libavcodec/bit_depth_template.c | 1 - libavcodec/cyuv.c | 1 - libavcodec/dv.c | 1 - libavcodec/dvbsub_parser.c | 1 - libavcodec/eaidct.c | 1 - libavcodec/eamad.c | 1 - libavcodec/eatqi.c | 1 - libavcodec/error_resilience.c | 1 - libavcodec/faandct.c | 1 - libavcodec/ffv1.c | 1 - libavcodec/ffv1dec.c | 1 - libavcodec/ffv1enc.c | 1 - libavcodec/h261.c | 1 - libavcodec/h261dec.c | 1 - libavcodec/h261enc.c | 1 - libavcodec/h263.c | 1 - libavcodec/h263dec.c | 1 - libavcodec/h264_cabac.c | 1 - libavcodec/h264_direct.c | 1 - libavcodec/h264_ps.c | 1 - libavcodec/h264_refs.c | 1 - libavcodec/h264pred.c | 1 + libavcodec/huffyuv.c | 1 - libavcodec/huffyuvdec.c | 1 - libavcodec/indeo4.c | 1 - libavcodec/intrax8dsp.c | 1 - libavcodec/ituh263dec.c | 1 - libavcodec/ituh263enc.c | 1 - libavcodec/ivi_dsp.c | 1 - libavcodec/jpeglsenc.c | 1 - libavcodec/libxvid_rc.c | 1 - libavcodec/ljpegenc.c | 1 - libavcodec/lpc.h | 1 - libavcodec/mdec.c | 1 - libavcodec/mjpegdec.c | 1 - libavcodec/mjpegenc.c | 1 - libavcodec/motion_est.c | 1 - libavcodec/mpc.c | 1 - libavcodec/mpeg12enc.c | 1 - libavcodec/mpegaudiodec.c | 1 - libavcodec/mpegvideo_xvmc.c | 1 - libavcodec/msrle.c | 1 - libavcodec/mss2dsp.h | 2 +- libavcodec/nellymoser.c | 1 - libavcodec/nellymoserdec.c | 1 - libavcodec/nellymoserenc.c | 1 - libavcodec/nuv.c | 1 - libavcodec/ppc/dsputil_ppc.c | 1 - libavcodec/ppc/fdct_altivec.c | 1 - libavcodec/ppc/gmc_altivec.c | 1 - libavcodec/ppc/idct_altivec.c | 1 - libavcodec/ppc/mpegvideo_altivec.c | 1 - libavcodec/ppc/vc1dsp_altivec.c | 1 - libavcodec/ppc/vp3dsp_altivec.c | 1 - libavcodec/qdm2.c | 1 - libavcodec/ra288.h | 1 - libavcodec/ratecontrol.c | 1 - libavcodec/rectangle.h | 1 - libavcodec/resample2.c | 1 - libavcodec/roqvideo.h | 1 - libavcodec/rtjpeg.c | 1 - libavcodec/rv10.c | 1 - libavcodec/rv30.c | 1 - libavcodec/rv30dsp.c | 1 - libavcodec/rv34.h | 1 - libavcodec/rv40.c | 1 - libavcodec/sh4/idct_sh4.c | 1 - libavcodec/sipr.h | 1 - libavcodec/sparc/simple_idct_vis.c | 1 - libavcodec/svq1enc.c | 1 - libavcodec/svq3.c | 1 - libavcodec/truemotion1.c | 2 +- libavcodec/twinvq.c | 1 - libavcodec/vaapi_mpeg2.c | 1 - libavcodec/vc1.c | 1 - libavcodec/vc1dec.c | 1 - libavcodec/vcr1.c | 1 - libavcodec/vorbis_data.c | 1 - libavcodec/vorbisenc.c | 1 - libavcodec/vp5.c | 1 - libavcodec/vp6.c | 1 - libavcodec/wma.h | 1 - libavcodec/wmaprodec.c | 1 - libavcodec/wmv2.h | 1 - libavcodec/wmv2dec.c | 1 - libavcodec/wmv2enc.c | 1 - libavcodec/x86/cavsdsp.c | 1 - libavcodec/x86/fft_init.c | 1 - libavcodec/x86/fmtconvert_init.c | 1 - libavcodec/x86/h264_qpel.c | 1 - libavcodec/x86/idct_sse2_xvid.c | 1 - libavcodec/x86/motion_est.c | 1 - libavcodec/x86/mpegvideo.c | 1 - libavcodec/x86/rv34dsp_init.c | 1 - libavcodec/x86/simple_idct.c | 1 - libavcodec/x86/vc1dsp_mmx.c | 1 - libavcodec/x86/vp56dsp_init.c | 1 - 121 files changed, 5 insertions(+), 120 deletions(-) diff --git a/libavcodec/aac.h b/libavcodec/aac.h index 97f46e26a2..b12d2bac33 100644 --- a/libavcodec/aac.h +++ b/libavcodec/aac.h @@ -32,7 +32,6 @@ #include "libavutil/float_dsp.h" #include "avcodec.h" -#include "dsputil.h" #include "fft.h" #include "mpeg4audio.h" #include "sbr.h" diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 133a557fba..e044f9ab65 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -83,7 +83,6 @@ #include "avcodec.h" #include "internal.h" #include "get_bits.h" -#include "dsputil.h" #include "fft.h" #include "fmtconvert.h" #include "lpc.h" diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index 00a6d0397d..5d15e85bde 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -34,7 +34,6 @@ #include "libavutil/opt.h" #include "avcodec.h" #include "put_bits.h" -#include "dsputil.h" #include "internal.h" #include "mpeg4audio.h" #include "kbdwin.h" diff --git a/libavcodec/aacenc.h b/libavcodec/aacenc.h index cc2eb7717d..dec445ce34 100644 --- a/libavcodec/aacenc.h +++ b/libavcodec/aacenc.h @@ -25,7 +25,6 @@ #include "libavutil/float_dsp.h" #include "avcodec.h" #include "put_bits.h" -#include "dsputil.h" #include "aac.h" #include "audio_frame_queue.h" diff --git a/libavcodec/aasc.c b/libavcodec/aasc.c index 823dcee4d5..5fcdfc0194 100644 --- a/libavcodec/aasc.c +++ b/libavcodec/aasc.c @@ -29,7 +29,6 @@ #include #include "avcodec.h" -#include "dsputil.h" #include "msrledec.h" typedef struct AascContext { diff --git a/libavcodec/alacenc.c b/libavcodec/alacenc.c index 3bc920a888..0143240588 100644 --- a/libavcodec/alacenc.c +++ b/libavcodec/alacenc.c @@ -21,7 +21,6 @@ #include "avcodec.h" #include "put_bits.h" -#include "dsputil.h" #include "internal.h" #include "lpc.h" #include "mathops.h" diff --git a/libavcodec/alpha/motion_est_alpha.c b/libavcodec/alpha/motion_est_alpha.c index 05839550f6..e062e9051f 100644 --- a/libavcodec/alpha/motion_est_alpha.c +++ b/libavcodec/alpha/motion_est_alpha.c @@ -19,7 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcodec/dsputil.h" #include "dsputil_alpha.h" #include "asm.h" diff --git a/libavcodec/alpha/mpegvideo_alpha.c b/libavcodec/alpha/mpegvideo_alpha.c index 023aef9143..5557159379 100644 --- a/libavcodec/alpha/mpegvideo_alpha.c +++ b/libavcodec/alpha/mpegvideo_alpha.c @@ -20,7 +20,6 @@ */ #include "libavutil/attributes.h" -#include "libavcodec/dsputil.h" #include "libavcodec/mpegvideo.h" #include "asm.h" diff --git a/libavcodec/alpha/simple_idct_alpha.c b/libavcodec/alpha/simple_idct_alpha.c index 3fa545d89a..262ad71c6f 100644 --- a/libavcodec/alpha/simple_idct_alpha.c +++ b/libavcodec/alpha/simple_idct_alpha.c @@ -26,7 +26,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcodec/dsputil.h" #include "dsputil_alpha.h" #include "asm.h" diff --git a/libavcodec/arm/dsputil_init_arm.c b/libavcodec/arm/dsputil_init_arm.c index 5a51d26691..cc24c0a10c 100644 --- a/libavcodec/arm/dsputil_init_arm.c +++ b/libavcodec/arm/dsputil_init_arm.c @@ -21,7 +21,6 @@ #include "libavutil/attributes.h" #include "libavutil/arm/cpu.h" -#include "libavcodec/dsputil.h" #include "dsputil_arm.h" void ff_j_rev_dct_arm(int16_t *data); diff --git a/libavcodec/arm/dsputil_init_armv5te.c b/libavcodec/arm/dsputil_init_armv5te.c index 222efdf8cc..302a65560c 100644 --- a/libavcodec/arm/dsputil_init_armv5te.c +++ b/libavcodec/arm/dsputil_init_armv5te.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcodec/dsputil.h" #include "dsputil_arm.h" void ff_simple_idct_armv5te(int16_t *data); diff --git a/libavcodec/arm/dsputil_init_armv6.c b/libavcodec/arm/dsputil_init_armv6.c index 88c31ec419..5e2c661039 100644 --- a/libavcodec/arm/dsputil_init_armv6.c +++ b/libavcodec/arm/dsputil_init_armv6.c @@ -21,7 +21,6 @@ #include #include "libavcodec/avcodec.h" -#include "libavcodec/dsputil.h" #include "dsputil_arm.h" void ff_simple_idct_armv6(int16_t *data); diff --git a/libavcodec/arm/dsputil_init_neon.c b/libavcodec/arm/dsputil_init_neon.c index 2c2d1148db..5866118740 100644 --- a/libavcodec/arm/dsputil_init_neon.c +++ b/libavcodec/arm/dsputil_init_neon.c @@ -23,7 +23,6 @@ #include "libavutil/attributes.h" #include "libavcodec/avcodec.h" -#include "libavcodec/dsputil.h" #include "dsputil_arm.h" void ff_simple_idct_neon(int16_t *data); diff --git a/libavcodec/arm/h264dsp_init_arm.c b/libavcodec/arm/h264dsp_init_arm.c index 13ae15c1a6..eb21ed5597 100644 --- a/libavcodec/arm/h264dsp_init_arm.c +++ b/libavcodec/arm/h264dsp_init_arm.c @@ -22,7 +22,6 @@ #include "libavutil/attributes.h" #include "libavutil/arm/cpu.h" -#include "libavcodec/dsputil.h" #include "libavcodec/h264dsp.h" void ff_h264_v_loop_filter_luma_neon(uint8_t *pix, int stride, int alpha, diff --git a/libavcodec/arm/mpegvideo_arm.c b/libavcodec/arm/mpegvideo_arm.c index 6fcd1d3cc3..0c046887ef 100644 --- a/libavcodec/arm/mpegvideo_arm.c +++ b/libavcodec/arm/mpegvideo_arm.c @@ -20,7 +20,6 @@ #include "libavutil/arm/cpu.h" #include "libavcodec/avcodec.h" -#include "libavcodec/dsputil.h" #include "libavcodec/mpegvideo.h" #include "mpegvideo_arm.h" #include "asm-offsets.h" diff --git a/libavcodec/arm/mpegvideo_armv5te.c b/libavcodec/arm/mpegvideo_armv5te.c index d395f09518..2066cbc425 100644 --- a/libavcodec/arm/mpegvideo_armv5te.c +++ b/libavcodec/arm/mpegvideo_armv5te.c @@ -21,7 +21,6 @@ #include "libavutil/attributes.h" #include "libavcodec/avcodec.h" -#include "libavcodec/dsputil.h" #include "libavcodec/mpegvideo.h" #include "mpegvideo_arm.h" diff --git a/libavcodec/asv.c b/libavcodec/asv.c index b15182d78d..f6788c9245 100644 --- a/libavcodec/asv.c +++ b/libavcodec/asv.c @@ -27,7 +27,6 @@ #include "asv.h" #include "avcodec.h" -#include "dsputil.h" const uint8_t ff_asv_scantab[64] = { 0x00,0x08,0x01,0x09,0x10,0x18,0x11,0x19, diff --git a/libavcodec/asvdec.c b/libavcodec/asvdec.c index adc114f7ab..a3adde9356 100644 --- a/libavcodec/asvdec.c +++ b/libavcodec/asvdec.c @@ -29,7 +29,6 @@ #include "asv.h" #include "avcodec.h" #include "put_bits.h" -#include "dsputil.h" #include "internal.h" #include "mathops.h" #include "mpeg12data.h" diff --git a/libavcodec/atrac.c b/libavcodec/atrac.c index a772e7db48..ebdbe818e0 100644 --- a/libavcodec/atrac.c +++ b/libavcodec/atrac.c @@ -30,7 +30,6 @@ #include #include "avcodec.h" -#include "dsputil.h" #include "atrac.h" float ff_atrac_sf_table[64]; diff --git a/libavcodec/atrac1.c b/libavcodec/atrac1.c index 17203f7959..9c265464fe 100644 --- a/libavcodec/atrac1.c +++ b/libavcodec/atrac1.c @@ -35,7 +35,6 @@ #include "libavutil/float_dsp.h" #include "avcodec.h" #include "get_bits.h" -#include "dsputil.h" #include "fft.h" #include "internal.h" #include "sinewin.h" diff --git a/libavcodec/bethsoftvideo.c b/libavcodec/bethsoftvideo.c index 77bf49cf47..d0b34fdbe4 100644 --- a/libavcodec/bethsoftvideo.c +++ b/libavcodec/bethsoftvideo.c @@ -28,7 +28,7 @@ */ #include "libavutil/common.h" -#include "dsputil.h" +#include "avcodec.h" #include "bethsoftvideo.h" #include "bytestream.h" diff --git a/libavcodec/bfin/mpegvideo_bfin.c b/libavcodec/bfin/mpegvideo_bfin.c index 7f7a910286..d03d3c0e76 100644 --- a/libavcodec/bfin/mpegvideo_bfin.c +++ b/libavcodec/bfin/mpegvideo_bfin.c @@ -22,7 +22,6 @@ #include "libavutil/attributes.h" #include "libavcodec/avcodec.h" -#include "libavcodec/dsputil.h" #include "libavcodec/mpegvideo.h" #include "dsputil_bfin.h" diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c index b8353f35fc..dea1ffae50 100644 --- a/libavcodec/binkaudio.c +++ b/libavcodec/binkaudio.c @@ -32,7 +32,6 @@ #include "avcodec.h" #define BITSTREAM_READER_LE #include "get_bits.h" -#include "dsputil.h" #include "dct.h" #include "rdft.h" #include "fmtconvert.h" diff --git a/libavcodec/binkdsp.h b/libavcodec/binkdsp.h index d105f717e9..4968413bee 100644 --- a/libavcodec/binkdsp.h +++ b/libavcodec/binkdsp.h @@ -27,7 +27,7 @@ #ifndef AVCODEC_BINKDSP_H #define AVCODEC_BINKDSP_H -#include "dsputil.h" +#include typedef struct BinkDSPContext { void (*idct_put)(uint8_t *dest/*align 8*/, int line_size, int32_t *block/*align 16*/); diff --git a/libavcodec/bit_depth_template.c b/libavcodec/bit_depth_template.c index 294b3bbfd2..a757f45382 100644 --- a/libavcodec/bit_depth_template.c +++ b/libavcodec/bit_depth_template.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "dsputil.h" #include "rnd_avg.h" #ifndef BIT_DEPTH diff --git a/libavcodec/cyuv.c b/libavcodec/cyuv.c index 9c34c7525a..6b9d5b9307 100644 --- a/libavcodec/cyuv.c +++ b/libavcodec/cyuv.c @@ -33,7 +33,6 @@ #include #include "avcodec.h" -#include "dsputil.h" #include "internal.h" #include "libavutil/internal.h" diff --git a/libavcodec/dv.c b/libavcodec/dv.c index 7ff0f74a90..91588192ae 100644 --- a/libavcodec/dv.c +++ b/libavcodec/dv.c @@ -41,7 +41,6 @@ #include "libavutil/internal.h" #include "libavutil/pixdesc.h" #include "avcodec.h" -#include "dsputil.h" #include "get_bits.h" #include "internal.h" #include "put_bits.h" diff --git a/libavcodec/dvbsub_parser.c b/libavcodec/dvbsub_parser.c index c13aab62b2..295e03bb18 100644 --- a/libavcodec/dvbsub_parser.c +++ b/libavcodec/dvbsub_parser.c @@ -19,7 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "avcodec.h" -#include "dsputil.h" #include "get_bits.h" /* Parser (mostly) copied from dvdsub.c */ diff --git a/libavcodec/eaidct.c b/libavcodec/eaidct.c index c87e32d733..5b2db44aff 100644 --- a/libavcodec/eaidct.c +++ b/libavcodec/eaidct.c @@ -25,7 +25,6 @@ * @author Peter Ross */ -#include "dsputil.h" #include "eaidct.h" #include "libavutil/common.h" diff --git a/libavcodec/eamad.c b/libavcodec/eamad.c index b8073dce3a..f9b43a147b 100644 --- a/libavcodec/eamad.c +++ b/libavcodec/eamad.c @@ -30,7 +30,6 @@ #include "avcodec.h" #include "get_bits.h" -#include "dsputil.h" #include "aandcttab.h" #include "eaidct.h" #include "internal.h" diff --git a/libavcodec/eatqi.c b/libavcodec/eatqi.c index 815ddc42c4..caf92366e1 100644 --- a/libavcodec/eatqi.c +++ b/libavcodec/eatqi.c @@ -28,7 +28,6 @@ #include "avcodec.h" #include "get_bits.h" -#include "dsputil.h" #include "aandcttab.h" #include "eaidct.h" #include "internal.h" diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index ff25c91455..39892e43b3 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -28,7 +28,6 @@ #include #include "avcodec.h" -#include "dsputil.h" #include "error_resilience.h" #include "mpegvideo.h" #include "rectangle.h" diff --git a/libavcodec/faandct.c b/libavcodec/faandct.c index 0219e20eab..b1d7a145f4 100644 --- a/libavcodec/faandct.c +++ b/libavcodec/faandct.c @@ -25,7 +25,6 @@ * @author Michael Niedermayer */ -#include "dsputil.h" #include "faandct.h" #include "libavutil/internal.h" #include "libavutil/libm.h" diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c index 682d111c0c..d37230c6c1 100644 --- a/libavcodec/ffv1.c +++ b/libavcodec/ffv1.c @@ -29,7 +29,6 @@ #include "avcodec.h" #include "get_bits.h" #include "put_bits.h" -#include "dsputil.h" #include "rangecoder.h" #include "golomb.h" #include "mathops.h" diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index 72f255cad1..a1b3db360c 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -34,7 +34,6 @@ #include "internal.h" #include "get_bits.h" #include "put_bits.h" -#include "dsputil.h" #include "rangecoder.h" #include "golomb.h" #include "mathops.h" diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index 8c6fc9a9c9..34191b7d84 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -34,7 +34,6 @@ #include "internal.h" #include "get_bits.h" #include "put_bits.h" -#include "dsputil.h" #include "rangecoder.h" #include "golomb.h" #include "mathops.h" diff --git a/libavcodec/h261.c b/libavcodec/h261.c index 9555613f6b..c3abdb23a7 100644 --- a/libavcodec/h261.c +++ b/libavcodec/h261.c @@ -25,7 +25,6 @@ * h261codec. */ -#include "dsputil.h" #include "avcodec.h" #include "h261.h" diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c index 9935897266..35d5002252 100644 --- a/libavcodec/h261dec.c +++ b/libavcodec/h261dec.c @@ -25,7 +25,6 @@ * H.261 decoder. */ -#include "dsputil.h" #include "avcodec.h" #include "mpegvideo.h" #include "h263.h" diff --git a/libavcodec/h261enc.c b/libavcodec/h261enc.c index b3a4cb0cc4..88b07965a0 100644 --- a/libavcodec/h261enc.c +++ b/libavcodec/h261enc.c @@ -25,7 +25,6 @@ * H.261 encoder. */ -#include "dsputil.h" #include "avcodec.h" #include "mpegvideo.h" #include "h263.h" diff --git a/libavcodec/h263.c b/libavcodec/h263.c index 03d45638b5..5ff47de76d 100644 --- a/libavcodec/h263.c +++ b/libavcodec/h263.c @@ -30,7 +30,6 @@ //#define DEBUG #include -#include "dsputil.h" #include "avcodec.h" #include "mpegvideo.h" #include "h263.h" diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index e24603bc10..663fe90244 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -28,7 +28,6 @@ #include "libavutil/cpu.h" #include "internal.h" #include "avcodec.h" -#include "dsputil.h" #include "mpegvideo.h" #include "h263.h" #include "h263_parser.h" diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index beb7d36b7c..4effc7d5e0 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -31,7 +31,6 @@ #include "cabac.h" #include "cabac_functions.h" #include "internal.h" -#include "dsputil.h" #include "avcodec.h" #include "h264.h" #include "h264data.h" diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c index e7a0b6188f..9d8758edfc 100644 --- a/libavcodec/h264_direct.c +++ b/libavcodec/h264_direct.c @@ -26,7 +26,6 @@ */ #include "internal.h" -#include "dsputil.h" #include "avcodec.h" #include "mpegvideo.h" #include "h264.h" diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index e35dab21d3..6c895a46ea 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -27,7 +27,6 @@ #include "libavutil/imgutils.h" #include "internal.h" -#include "dsputil.h" #include "avcodec.h" #include "h264.h" #include "h264data.h" //FIXME FIXME FIXME (just for zigzag_scan) diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index f855bcb377..ead18c5680 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -26,7 +26,6 @@ */ #include "internal.h" -#include "dsputil.h" #include "avcodec.h" #include "h264.h" #include "golomb.h" diff --git a/libavcodec/h264pred.c b/libavcodec/h264pred.c index 48a4a794c4..15f2112b91 100644 --- a/libavcodec/h264pred.c +++ b/libavcodec/h264pred.c @@ -25,6 +25,7 @@ * @author Michael Niedermayer */ +#include "dsputil.h" #include "h264pred.h" #define BIT_DEPTH 8 diff --git a/libavcodec/huffyuv.c b/libavcodec/huffyuv.c index 58559f1821..d4cf6fa980 100644 --- a/libavcodec/huffyuv.c +++ b/libavcodec/huffyuv.c @@ -33,7 +33,6 @@ #include "libavutil/mem.h" #include "avcodec.h" -#include "dsputil.h" #include "huffyuv.h" int ff_huffyuv_generate_bits_table(uint32_t *dst, const uint8_t *len_table) diff --git a/libavcodec/huffyuvdec.c b/libavcodec/huffyuvdec.c index 0946d3d47e..6aa7335bf9 100644 --- a/libavcodec/huffyuvdec.c +++ b/libavcodec/huffyuvdec.c @@ -29,7 +29,6 @@ */ #include "avcodec.h" -#include "dsputil.h" #include "get_bits.h" #include "huffyuv.h" #include "thread.h" diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c index 2eebc26513..07fbc8e34d 100644 --- a/libavcodec/indeo4.c +++ b/libavcodec/indeo4.c @@ -30,7 +30,6 @@ #define BITSTREAM_READER_LE #include "avcodec.h" #include "get_bits.h" -#include "dsputil.h" #include "ivi_dsp.h" #include "ivi_common.h" #include "indeo4data.h" diff --git a/libavcodec/intrax8dsp.c b/libavcodec/intrax8dsp.c index ddceb2c9ff..1115945eba 100644 --- a/libavcodec/intrax8dsp.c +++ b/libavcodec/intrax8dsp.c @@ -21,7 +21,6 @@ *@brief IntraX8 frame subdecoder image manipulation routines */ -#include "dsputil.h" #include "intrax8dsp.h" #include "libavutil/common.h" diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c index c3552da35e..7f79982c6b 100644 --- a/libavcodec/ituh263dec.c +++ b/libavcodec/ituh263dec.c @@ -32,7 +32,6 @@ #include "libavutil/internal.h" #include "libavutil/mathematics.h" -#include "dsputil.h" #include "avcodec.h" #include "mpegvideo.h" #include "h263.h" diff --git a/libavcodec/ituh263enc.c b/libavcodec/ituh263enc.c index 07277bbeda..05f9631d53 100644 --- a/libavcodec/ituh263enc.c +++ b/libavcodec/ituh263enc.c @@ -30,7 +30,6 @@ //#define DEBUG #include -#include "dsputil.h" #include "avcodec.h" #include "mpegvideo.h" #include "h263.h" diff --git a/libavcodec/ivi_dsp.c b/libavcodec/ivi_dsp.c index dee6ff2953..f5efa6521d 100644 --- a/libavcodec/ivi_dsp.c +++ b/libavcodec/ivi_dsp.c @@ -27,7 +27,6 @@ */ #include "avcodec.h" -#include "dsputil.h" #include "ivi_common.h" #include "ivi_dsp.h" diff --git a/libavcodec/jpeglsenc.c b/libavcodec/jpeglsenc.c index fea2a5baef..f6d88016a1 100644 --- a/libavcodec/jpeglsenc.c +++ b/libavcodec/jpeglsenc.c @@ -30,7 +30,6 @@ #include "golomb.h" #include "internal.h" #include "mathops.h" -#include "dsputil.h" #include "mjpeg.h" #include "jpegls.h" diff --git a/libavcodec/libxvid_rc.c b/libavcodec/libxvid_rc.c index bf9f6f0738..dd4cff274e 100644 --- a/libavcodec/libxvid_rc.c +++ b/libavcodec/libxvid_rc.c @@ -29,7 +29,6 @@ #include "avcodec.h" #include "libxvid.h" -//#include "dsputil.h" #include "mpegvideo.h" #undef NDEBUG diff --git a/libavcodec/ljpegenc.c b/libavcodec/ljpegenc.c index 78ba2c962e..555bffa4ee 100644 --- a/libavcodec/ljpegenc.c +++ b/libavcodec/ljpegenc.c @@ -31,7 +31,6 @@ */ #include "avcodec.h" -#include "dsputil.h" #include "internal.h" #include "mpegvideo.h" #include "mjpeg.h" diff --git a/libavcodec/lpc.h b/libavcodec/lpc.h index 6590608693..c41a1f8a03 100644 --- a/libavcodec/lpc.h +++ b/libavcodec/lpc.h @@ -23,7 +23,6 @@ #define AVCODEC_LPC_H #include -#include "dsputil.h" #define ORDER_METHOD_EST 0 #define ORDER_METHOD_2LEVEL 1 diff --git a/libavcodec/mdec.c b/libavcodec/mdec.c index 59bb6bee54..f85c3bac89 100644 --- a/libavcodec/mdec.c +++ b/libavcodec/mdec.c @@ -28,7 +28,6 @@ */ #include "avcodec.h" -#include "dsputil.h" #include "mpegvideo.h" #include "mpeg12.h" #include "thread.h" diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index e63287a46b..470529fcee 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -36,7 +36,6 @@ #include "libavutil/imgutils.h" #include "libavutil/opt.h" #include "avcodec.h" -#include "dsputil.h" #include "internal.h" #include "mjpeg.h" #include "mjpegdec.h" diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index 9aeb68fdc6..2a83a204a2 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -34,7 +34,6 @@ #include #include "avcodec.h" -#include "dsputil.h" #include "mpegvideo.h" #include "mjpeg.h" #include "mjpegenc.h" diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index e051191883..11285825a6 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -32,7 +32,6 @@ #include #include "avcodec.h" -#include "dsputil.h" #include "mathops.h" #include "mpegvideo.h" diff --git a/libavcodec/mpc.c b/libavcodec/mpc.c index 5a54a9bad9..97b405f42c 100644 --- a/libavcodec/mpc.c +++ b/libavcodec/mpc.c @@ -28,7 +28,6 @@ #include "avcodec.h" #include "get_bits.h" -#include "dsputil.h" #include "mpegaudiodsp.h" #include "mpegaudio.h" diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index da344e5ad3..348d535565 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -26,7 +26,6 @@ */ #include "avcodec.h" -#include "dsputil.h" #include "mathops.h" #include "mpegvideo.h" diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c index 03cc6b080b..721f0965a7 100644 --- a/libavcodec/mpegaudiodec.c +++ b/libavcodec/mpegaudiodec.c @@ -32,7 +32,6 @@ #include "internal.h" #include "mathops.h" #include "mpegaudiodsp.h" -#include "dsputil.h" /* * TODO: diff --git a/libavcodec/mpegvideo_xvmc.c b/libavcodec/mpegvideo_xvmc.c index 9a2b140dfc..6ebc307835 100644 --- a/libavcodec/mpegvideo_xvmc.c +++ b/libavcodec/mpegvideo_xvmc.c @@ -23,7 +23,6 @@ #include #include "avcodec.h" -#include "dsputil.h" #include "mpegvideo.h" #undef NDEBUG diff --git a/libavcodec/msrle.c b/libavcodec/msrle.c index 7bca67f42e..c301b0c979 100644 --- a/libavcodec/msrle.c +++ b/libavcodec/msrle.c @@ -33,7 +33,6 @@ #include #include "avcodec.h" -#include "dsputil.h" #include "msrledec.h" typedef struct MsrleContext { diff --git a/libavcodec/mss2dsp.h b/libavcodec/mss2dsp.h index 34b095bdc5..61c3a04fcd 100644 --- a/libavcodec/mss2dsp.h +++ b/libavcodec/mss2dsp.h @@ -26,7 +26,7 @@ #ifndef AVCODEC_MSS2DSP_H #define AVCODEC_MSS2DSP_H -#include "dsputil.h" +#include typedef struct MSS2DSPContext { void (*mss2_blit_wmv9)(uint8_t *dst, int dst_stride, diff --git a/libavcodec/nellymoser.c b/libavcodec/nellymoser.c index 195e2e80ae..0740c75a0f 100644 --- a/libavcodec/nellymoser.c +++ b/libavcodec/nellymoser.c @@ -33,7 +33,6 @@ #include "nellymoser.h" #include "avcodec.h" -#include "dsputil.h" #define BITSTREAM_READER_LE #include "get_bits.h" diff --git a/libavcodec/nellymoserdec.c b/libavcodec/nellymoserdec.c index e427b23a07..d78916b1c9 100644 --- a/libavcodec/nellymoserdec.c +++ b/libavcodec/nellymoserdec.c @@ -36,7 +36,6 @@ #include "libavutil/lfg.h" #include "libavutil/random_seed.h" #include "avcodec.h" -#include "dsputil.h" #include "fft.h" #include "fmtconvert.h" #include "internal.h" diff --git a/libavcodec/nellymoserenc.c b/libavcodec/nellymoserenc.c index 34a15e5a50..8721c26f5f 100644 --- a/libavcodec/nellymoserenc.c +++ b/libavcodec/nellymoserenc.c @@ -40,7 +40,6 @@ #include "nellymoser.h" #include "avcodec.h" #include "audio_frame_queue.h" -#include "dsputil.h" #include "fft.h" #include "internal.h" #include "sinewin.h" diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c index bba4df39fc..193bed6e71 100644 --- a/libavcodec/nuv.c +++ b/libavcodec/nuv.c @@ -27,7 +27,6 @@ #include "libavutil/lzo.h" #include "libavutil/imgutils.h" #include "avcodec.h" -#include "dsputil.h" #include "rtjpeg.h" typedef struct { diff --git a/libavcodec/ppc/dsputil_ppc.c b/libavcodec/ppc/dsputil_ppc.c index 1eebafa92e..463bc70f26 100644 --- a/libavcodec/ppc/dsputil_ppc.c +++ b/libavcodec/ppc/dsputil_ppc.c @@ -25,7 +25,6 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/mem.h" -#include "libavcodec/dsputil.h" #include "dsputil_altivec.h" /* ***** WARNING ***** WARNING ***** WARNING ***** */ diff --git a/libavcodec/ppc/fdct_altivec.c b/libavcodec/ppc/fdct_altivec.c index 0e3658dd2f..b1e70d624f 100644 --- a/libavcodec/ppc/fdct_altivec.c +++ b/libavcodec/ppc/fdct_altivec.c @@ -23,7 +23,6 @@ #include #endif #include "libavutil/common.h" -#include "libavcodec/dsputil.h" #include "dsputil_altivec.h" #define vs16(v) ((vector signed short)(v)) diff --git a/libavcodec/ppc/gmc_altivec.c b/libavcodec/ppc/gmc_altivec.c index f86964bc58..38968dd734 100644 --- a/libavcodec/ppc/gmc_altivec.c +++ b/libavcodec/ppc/gmc_altivec.c @@ -23,7 +23,6 @@ #include "libavutil/mem.h" #include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/util_altivec.h" -#include "libavcodec/dsputil.h" #include "dsputil_altivec.h" /* diff --git a/libavcodec/ppc/idct_altivec.c b/libavcodec/ppc/idct_altivec.c index e599491855..f68a61ddcd 100644 --- a/libavcodec/ppc/idct_altivec.c +++ b/libavcodec/ppc/idct_altivec.c @@ -42,7 +42,6 @@ #include #endif #include "libavutil/ppc/types_altivec.h" -#include "libavcodec/dsputil.h" #include "dsputil_altivec.h" #define IDCT_HALF \ diff --git a/libavcodec/ppc/mpegvideo_altivec.c b/libavcodec/ppc/mpegvideo_altivec.c index 081d5c44a8..f6c85fdb71 100644 --- a/libavcodec/ppc/mpegvideo_altivec.c +++ b/libavcodec/ppc/mpegvideo_altivec.c @@ -28,7 +28,6 @@ #include "libavutil/cpu.h" #include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/util_altivec.h" -#include "libavcodec/dsputil.h" #include "libavcodec/mpegvideo.h" #include "dsputil_altivec.h" diff --git a/libavcodec/ppc/vc1dsp_altivec.c b/libavcodec/ppc/vc1dsp_altivec.c index 18ec50f58d..07bacb1bc9 100644 --- a/libavcodec/ppc/vc1dsp_altivec.c +++ b/libavcodec/ppc/vc1dsp_altivec.c @@ -22,7 +22,6 @@ #include "libavutil/attributes.h" #include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/util_altivec.h" -#include "libavcodec/dsputil.h" #include "libavcodec/vc1dsp.h" // main steps of 8x8 transform diff --git a/libavcodec/ppc/vp3dsp_altivec.c b/libavcodec/ppc/vp3dsp_altivec.c index 6bf5f0e033..e1e8988a53 100644 --- a/libavcodec/ppc/vp3dsp_altivec.c +++ b/libavcodec/ppc/vp3dsp_altivec.c @@ -29,7 +29,6 @@ #include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/util_altivec.h" -#include "libavcodec/dsputil.h" #include "dsputil_altivec.h" static const vec_s16 constants = diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c index 61ac0a830d..082a64f35e 100644 --- a/libavcodec/qdm2.c +++ b/libavcodec/qdm2.c @@ -39,7 +39,6 @@ #include "libavutil/channel_layout.h" #include "avcodec.h" #include "get_bits.h" -#include "dsputil.h" #include "internal.h" #include "rdft.h" #include "mpegaudiodsp.h" diff --git a/libavcodec/ra288.h b/libavcodec/ra288.h index 80835800b9..9f4beebbcf 100644 --- a/libavcodec/ra288.h +++ b/libavcodec/ra288.h @@ -23,7 +23,6 @@ #define AVCODEC_RA288_H #include -#include "dsputil.h" #include "libavutil/common.h" static const float amptable[8]={ diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c index c3db90d5a7..21fc8c5b23 100644 --- a/libavcodec/ratecontrol.c +++ b/libavcodec/ratecontrol.c @@ -26,7 +26,6 @@ */ #include "avcodec.h" -#include "dsputil.h" #include "ratecontrol.h" #include "mpegvideo.h" #include "libavutil/eval.h" diff --git a/libavcodec/rectangle.h b/libavcodec/rectangle.h index f18f667ad3..73e8b0abd1 100644 --- a/libavcodec/rectangle.h +++ b/libavcodec/rectangle.h @@ -31,7 +31,6 @@ #include #include "config.h" #include "libavutil/common.h" -#include "dsputil.h" /** * fill a rectangle. diff --git a/libavcodec/resample2.c b/libavcodec/resample2.c index c6e5c48c1b..5b6e85514a 100644 --- a/libavcodec/resample2.c +++ b/libavcodec/resample2.c @@ -26,7 +26,6 @@ */ #include "avcodec.h" -#include "dsputil.h" #include "libavutil/common.h" #if FF_API_AVCODEC_RESAMPLE diff --git a/libavcodec/roqvideo.h b/libavcodec/roqvideo.h index 33d77edc8b..eed2f226fe 100644 --- a/libavcodec/roqvideo.h +++ b/libavcodec/roqvideo.h @@ -25,7 +25,6 @@ #include "libavutil/lfg.h" #include "avcodec.h" #include "bytestream.h" -#include "dsputil.h" typedef struct roq_cell { unsigned char y[4]; diff --git a/libavcodec/rtjpeg.c b/libavcodec/rtjpeg.c index 5ae47780ec..6da7759407 100644 --- a/libavcodec/rtjpeg.c +++ b/libavcodec/rtjpeg.c @@ -20,7 +20,6 @@ */ #include "libavutil/common.h" #include "get_bits.h" -#include "dsputil.h" #include "rtjpeg.h" #define PUT_COEFF(c) \ diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index 9a9da919d8..29e41dc9b9 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -27,7 +27,6 @@ #include "libavutil/imgutils.h" #include "avcodec.h" -#include "dsputil.h" #include "mpegvideo.h" #include "mpeg4video.h" #include "h263.h" diff --git a/libavcodec/rv30.c b/libavcodec/rv30.c index 3c3579b565..ae99a823bf 100644 --- a/libavcodec/rv30.c +++ b/libavcodec/rv30.c @@ -25,7 +25,6 @@ */ #include "avcodec.h" -#include "dsputil.h" #include "mpegvideo.h" #include "golomb.h" diff --git a/libavcodec/rv30dsp.c b/libavcodec/rv30dsp.c index 0ae8855d18..0ec8c78615 100644 --- a/libavcodec/rv30dsp.c +++ b/libavcodec/rv30dsp.c @@ -25,7 +25,6 @@ */ #include "avcodec.h" -#include "dsputil.h" #include "h264chroma.h" #include "h264qpel.h" #include "rv34dsp.h" diff --git a/libavcodec/rv34.h b/libavcodec/rv34.h index f40e2828ab..c32c089cdd 100644 --- a/libavcodec/rv34.h +++ b/libavcodec/rv34.h @@ -28,7 +28,6 @@ #define AVCODEC_RV34_H #include "avcodec.h" -#include "dsputil.h" #include "mpegvideo.h" #include "h264pred.h" diff --git a/libavcodec/rv40.c b/libavcodec/rv40.c index f95622ab5a..1f2deac3c9 100644 --- a/libavcodec/rv40.c +++ b/libavcodec/rv40.c @@ -27,7 +27,6 @@ #include "libavutil/imgutils.h" #include "avcodec.h" -#include "dsputil.h" #include "mpegvideo.h" #include "golomb.h" diff --git a/libavcodec/sh4/idct_sh4.c b/libavcodec/sh4/idct_sh4.c index 87f175f0e1..768b334ee7 100644 --- a/libavcodec/sh4/idct_sh4.c +++ b/libavcodec/sh4/idct_sh4.c @@ -20,7 +20,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcodec/dsputil.h" #include "dsputil_sh4.h" #include "sh4.h" diff --git a/libavcodec/sipr.h b/libavcodec/sipr.h index 1a35cdbfc1..4cdea67e51 100644 --- a/libavcodec/sipr.h +++ b/libavcodec/sipr.h @@ -25,7 +25,6 @@ #define AVCODEC_SIPR_H #include "avcodec.h" -#include "dsputil.h" #include "acelp_pitch_delay.h" #include "libavutil/mem.h" diff --git a/libavcodec/sparc/simple_idct_vis.c b/libavcodec/sparc/simple_idct_vis.c index 1e0f4119e9..2057d66df4 100644 --- a/libavcodec/sparc/simple_idct_vis.c +++ b/libavcodec/sparc/simple_idct_vis.c @@ -24,7 +24,6 @@ #include -#include "libavcodec/dsputil.h" #include "dsputil_vis.h" #include "libavutil/mem.h" diff --git a/libavcodec/svq1enc.c b/libavcodec/svq1enc.c index 5a80868139..e654b4ecb3 100644 --- a/libavcodec/svq1enc.c +++ b/libavcodec/svq1enc.c @@ -27,7 +27,6 @@ */ #include "avcodec.h" -#include "dsputil.h" #include "mpegvideo.h" #include "h263.h" #include "internal.h" diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index 8b7218e487..04c18587ce 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -40,7 +40,6 @@ * http://samples.libav.org/V-codecs/SVQ3/Vertical400kbit.sorenson3.mov */ #include "internal.h" -#include "dsputil.h" #include "avcodec.h" #include "mpegvideo.h" #include "h264.h" diff --git a/libavcodec/truemotion1.c b/libavcodec/truemotion1.c index 232ee2c2b8..73f7056965 100644 --- a/libavcodec/truemotion1.c +++ b/libavcodec/truemotion1.c @@ -34,9 +34,9 @@ #include #include "avcodec.h" -#include "dsputil.h" #include "libavutil/imgutils.h" #include "libavutil/internal.h" +#include "libavutil/intreadwrite.h" #include "libavutil/mem.h" #include "truemotion1data.h" diff --git a/libavcodec/twinvq.c b/libavcodec/twinvq.c index 1ff85caa24..339808131e 100644 --- a/libavcodec/twinvq.c +++ b/libavcodec/twinvq.c @@ -23,7 +23,6 @@ #include "libavutil/float_dsp.h" #include "avcodec.h" #include "get_bits.h" -#include "dsputil.h" #include "fft.h" #include "internal.h" #include "lsp.h" diff --git a/libavcodec/vaapi_mpeg2.c b/libavcodec/vaapi_mpeg2.c index eb94131215..cf0a4b537d 100644 --- a/libavcodec/vaapi_mpeg2.c +++ b/libavcodec/vaapi_mpeg2.c @@ -21,7 +21,6 @@ */ #include "vaapi_internal.h" -#include "dsputil.h" /** Reconstruct bitstream f_code */ static inline int mpeg2_get_f_code(MpegEncContext *s) diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index a8dd38ad5f..b467e4601e 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -28,7 +28,6 @@ */ #include "internal.h" -#include "dsputil.h" #include "avcodec.h" #include "mpegvideo.h" #include "vc1.h" diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 4b37db6215..403bac8fff 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -27,7 +27,6 @@ */ #include "internal.h" -#include "dsputil.h" #include "avcodec.h" #include "mpegvideo.h" #include "h263.h" diff --git a/libavcodec/vcr1.c b/libavcodec/vcr1.c index d9514693c2..499b1c75c6 100644 --- a/libavcodec/vcr1.c +++ b/libavcodec/vcr1.c @@ -25,7 +25,6 @@ */ #include "avcodec.h" -#include "dsputil.h" #include "internal.h" #include "libavutil/internal.h" diff --git a/libavcodec/vorbis_data.c b/libavcodec/vorbis_data.c index 03c3d6bae6..bafb77b1e8 100644 --- a/libavcodec/vorbis_data.c +++ b/libavcodec/vorbis_data.c @@ -20,7 +20,6 @@ #include "libavutil/channel_layout.h" #include "libavutil/mem.h" -#include "dsputil.h" #include "vorbis.h" const uint8_t ff_vorbis_channel_layout_offsets[8][8] = { diff --git a/libavcodec/vorbisenc.c b/libavcodec/vorbisenc.c index 16f4d65acc..3d4f806ae5 100644 --- a/libavcodec/vorbisenc.c +++ b/libavcodec/vorbisenc.c @@ -26,7 +26,6 @@ #include #include "avcodec.h" -#include "dsputil.h" #include "internal.h" #include "fft.h" #include "vorbis.h" diff --git a/libavcodec/vp5.c b/libavcodec/vp5.c index 36716237cc..89333f3d92 100644 --- a/libavcodec/vp5.c +++ b/libavcodec/vp5.c @@ -27,7 +27,6 @@ #include #include "avcodec.h" -#include "dsputil.h" #include "get_bits.h" #include "vp56.h" diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c index 87c887b41c..b824e3b1cd 100644 --- a/libavcodec/vp6.c +++ b/libavcodec/vp6.c @@ -30,7 +30,6 @@ #include #include "avcodec.h" -#include "dsputil.h" #include "get_bits.h" #include "huffman.h" diff --git a/libavcodec/wma.h b/libavcodec/wma.h index ced3a8f87f..513ba3fc20 100644 --- a/libavcodec/wma.h +++ b/libavcodec/wma.h @@ -25,7 +25,6 @@ #include "libavutil/float_dsp.h" #include "get_bits.h" #include "put_bits.h" -#include "dsputil.h" #include "fft.h" #include "fmtconvert.h" diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c index e8b9df4e7d..0954795f31 100644 --- a/libavcodec/wmaprodec.c +++ b/libavcodec/wmaprodec.c @@ -94,7 +94,6 @@ #include "get_bits.h" #include "put_bits.h" #include "wmaprodata.h" -#include "dsputil.h" #include "sinewin.h" #include "wma.h" #include "wma_common.h" diff --git a/libavcodec/wmv2.h b/libavcodec/wmv2.h index 9a1717a722..e01f6c115b 100644 --- a/libavcodec/wmv2.h +++ b/libavcodec/wmv2.h @@ -22,7 +22,6 @@ #define AVCODEC_WMV2_H #include "avcodec.h" -#include "dsputil.h" #include "mpegvideo.h" #include "intrax8.h" #include "wmv2dsp.h" diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c index 4fb3e06f32..acce8c7c0f 100644 --- a/libavcodec/wmv2dec.c +++ b/libavcodec/wmv2dec.c @@ -19,7 +19,6 @@ */ #include "avcodec.h" -#include "dsputil.h" #include "mpegvideo.h" #include "h263.h" #include "mathops.h" diff --git a/libavcodec/wmv2enc.c b/libavcodec/wmv2enc.c index 91c7a2990e..930ee9aa73 100644 --- a/libavcodec/wmv2enc.c +++ b/libavcodec/wmv2enc.c @@ -19,7 +19,6 @@ */ #include "avcodec.h" -#include "dsputil.h" #include "mpegvideo.h" #include "msmpeg4.h" #include "msmpeg4data.h" diff --git a/libavcodec/x86/cavsdsp.c b/libavcodec/x86/cavsdsp.c index 80c34bbb3b..3e36ed04c0 100644 --- a/libavcodec/x86/cavsdsp.c +++ b/libavcodec/x86/cavsdsp.c @@ -27,7 +27,6 @@ #include "libavutil/cpu.h" #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" -#include "libavcodec/dsputil.h" #include "libavcodec/cavsdsp.h" #include "dsputil_mmx.h" #include "config.h" diff --git a/libavcodec/x86/fft_init.c b/libavcodec/x86/fft_init.c index 5554b249ef..77f5ba96f8 100644 --- a/libavcodec/x86/fft_init.c +++ b/libavcodec/x86/fft_init.c @@ -18,7 +18,6 @@ #include "libavutil/cpu.h" #include "libavutil/x86/cpu.h" -#include "libavcodec/dsputil.h" #include "libavcodec/dct.h" #include "fft.h" diff --git a/libavcodec/x86/fmtconvert_init.c b/libavcodec/x86/fmtconvert_init.c index 1eaff37365..05afe22b79 100644 --- a/libavcodec/x86/fmtconvert_init.c +++ b/libavcodec/x86/fmtconvert_init.c @@ -27,7 +27,6 @@ #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" #include "libavcodec/fmtconvert.h" -#include "libavcodec/dsputil.h" #if HAVE_YASM diff --git a/libavcodec/x86/h264_qpel.c b/libavcodec/x86/h264_qpel.c index 11d849b6b3..9954243ac6 100644 --- a/libavcodec/x86/h264_qpel.c +++ b/libavcodec/x86/h264_qpel.c @@ -23,7 +23,6 @@ #include "libavutil/cpu.h" #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" -#include "libavcodec/dsputil.h" #include "libavcodec/h264qpel.h" #include "libavcodec/mpegvideo.h" #include "dsputil_mmx.h" diff --git a/libavcodec/x86/idct_sse2_xvid.c b/libavcodec/x86/idct_sse2_xvid.c index f083a2cbaa..207af6b3ce 100644 --- a/libavcodec/x86/idct_sse2_xvid.c +++ b/libavcodec/x86/idct_sse2_xvid.c @@ -38,7 +38,6 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcodec/dsputil.h" #include "libavutil/internal.h" #include "libavutil/mem.h" #include "libavutil/x86/asm.h" diff --git a/libavcodec/x86/motion_est.c b/libavcodec/x86/motion_est.c index 34949f01f3..103a998d86 100644 --- a/libavcodec/x86/motion_est.c +++ b/libavcodec/x86/motion_est.c @@ -26,7 +26,6 @@ #include "libavutil/internal.h" #include "libavutil/mem.h" #include "libavutil/x86/asm.h" -#include "libavcodec/dsputil.h" #include "dsputil_mmx.h" #if HAVE_INLINE_ASM diff --git a/libavcodec/x86/mpegvideo.c b/libavcodec/x86/mpegvideo.c index 4e16142182..a603bfb4b8 100644 --- a/libavcodec/x86/mpegvideo.c +++ b/libavcodec/x86/mpegvideo.c @@ -23,7 +23,6 @@ #include "libavutil/cpu.h" #include "libavutil/x86/asm.h" #include "libavcodec/avcodec.h" -#include "libavcodec/dsputil.h" #include "libavcodec/mpegvideo.h" #include "dsputil_mmx.h" diff --git a/libavcodec/x86/rv34dsp_init.c b/libavcodec/x86/rv34dsp_init.c index 70f86299bb..a2dea74220 100644 --- a/libavcodec/x86/rv34dsp_init.c +++ b/libavcodec/x86/rv34dsp_init.c @@ -22,7 +22,6 @@ #include "libavutil/cpu.h" #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" -#include "libavcodec/dsputil.h" #include "libavcodec/rv34dsp.h" void ff_rv34_idct_dc_mmxext(int16_t *block); diff --git a/libavcodec/x86/simple_idct.c b/libavcodec/x86/simple_idct.c index 966beaa538..f31f7f42f2 100644 --- a/libavcodec/x86/simple_idct.c +++ b/libavcodec/x86/simple_idct.c @@ -19,7 +19,6 @@ * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcodec/dsputil.h" #include "libavcodec/simple_idct.h" #include "libavutil/internal.h" #include "libavutil/mem.h" diff --git a/libavcodec/x86/vc1dsp_mmx.c b/libavcodec/x86/vc1dsp_mmx.c index 5037aeea24..345b213f9d 100644 --- a/libavcodec/x86/vc1dsp_mmx.c +++ b/libavcodec/x86/vc1dsp_mmx.c @@ -29,7 +29,6 @@ #include "libavutil/mem.h" #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" -#include "libavcodec/dsputil.h" #include "dsputil_mmx.h" #include "libavcodec/vc1dsp.h" #include "vc1dsp.h" diff --git a/libavcodec/x86/vp56dsp_init.c b/libavcodec/x86/vp56dsp_init.c index 3b49df635f..689ae352c6 100644 --- a/libavcodec/x86/vp56dsp_init.c +++ b/libavcodec/x86/vp56dsp_init.c @@ -23,7 +23,6 @@ #include "libavutil/cpu.h" #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" -#include "libavcodec/dsputil.h" #include "libavcodec/vp56dsp.h" void ff_vp6_filter_diag4_mmx(uint8_t *dst, uint8_t *src, int stride,