Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f'

* commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f': Remove unnecessary dsputil.h #includes Conflicts: libavcodec/ffv1.c libavcodec/h261dec.c libavcodec/h261enc.c libavcodec/h264pred.c libavcodec/lpc.h libavcodec/mjpegdec.c libavcodec/rectangle.h libavcodec/x86/idct_sse2_xvid.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago · a984efd104
parent 9b1a0c2ee8 c242bbd8b6
commit a984efd104
120 changed files with 5 additions and 120 deletions
--- 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"
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@ -84,7 +84,6 @@
 #include "avcodec.h"
 #include "internal.h"
 #include "get_bits.h"
-#include "dsputil.h"
 #include "fft.h"
 #include "fmtconvert.h"
 #include "lpc.h"
--- 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"
--- 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"
--- a/libavcodec/aasc.c
+++ b/libavcodec/aasc.c
@ -29,7 +29,6 @@
 #include <string.h>

 #include "avcodec.h"
-#include "dsputil.h"
 #include "msrledec.h"

 typedef struct AascContext {
--- 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"
--- 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"

--- 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"

--- 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"

--- 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);
--- 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);
--- a/libavcodec/arm/dsputil_init_armv6.c
+++ b/libavcodec/arm/dsputil_init_armv6.c
@ -21,7 +21,6 @@
 #include <stdint.h>

 #include "libavcodec/avcodec.h"
-#include "libavcodec/dsputil.h"
 #include "dsputil_arm.h"

 void ff_simple_idct_armv6(int16_t *data);
--- 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);
--- 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,
--- 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"
--- a/libavcodec/arm/mpegvideo_armv5te.c
+++ b/libavcodec/arm/mpegvideo_armv5te.c
@ -22,7 +22,6 @@
 #include "libavutil/attributes.h"
 #include "libavutil/avassert.h"
 #include "libavcodec/avcodec.h"
-#include "libavcodec/dsputil.h"
 #include "libavcodec/mpegvideo.h"
 #include "mpegvideo_arm.h"

--- 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,
--- 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"
--- a/libavcodec/atrac.c
+++ b/libavcodec/atrac.c
@ -30,7 +30,6 @@
 #include <string.h>

 #include "avcodec.h"
-#include "dsputil.h"
 #include "atrac.h"

 float ff_atrac_sf_table[64];
--- 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"
--- 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"

--- 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"

--- 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"
--- a/libavcodec/binkdsp.h
+++ b/libavcodec/binkdsp.h
@ -27,7 +27,7 @@
 #ifndef AVCODEC_BINKDSP_H
 #define AVCODEC_BINKDSP_H

-#include "dsputil.h"
+#include <stdint.h>

 typedef struct BinkDSPContext {
    void (*idct_put)(uint8_t *dest/*align 8*/, int line_size, int32_t *block/*align 16*/);
--- a/libavcodec/cyuv.c
+++ b/libavcodec/cyuv.c
@ -33,7 +33,6 @@
 #include <string.h>

 #include "avcodec.h"
-#include "dsputil.h"
 #include "internal.h"
 #include "libavutil/internal.h"

--- 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"
--- 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 */
--- a/libavcodec/eaidct.c
+++ b/libavcodec/eaidct.c
@ -25,7 +25,6 @@
 * @author Peter Ross <pross@xvid.org>
 */

-#include "dsputil.h"
 #include "eaidct.h"
 #include "libavutil/common.h"

--- 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"
--- 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"
--- a/libavcodec/error_resilience.c
+++ b/libavcodec/error_resilience.c
@ -28,7 +28,6 @@
 #include <limits.h>

 #include "avcodec.h"
-#include "dsputil.h"
 #include "error_resilience.h"
 #include "mpegvideo.h"
 #include "rectangle.h"
--- a/libavcodec/faandct.c
+++ b/libavcodec/faandct.c
@ -25,7 +25,6 @@
 * @author Michael Niedermayer <michaelni@gmx.at>
 */

-#include "dsputil.h"
 #include "faandct.h"
 #include "libavutil/internal.h"
 #include "libavutil/libm.h"
--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@ -33,7 +33,6 @@
 #include "libavutil/timer.h"
 #include "avcodec.h"
 #include "internal.h"
-#include "dsputil.h"
 #include "rangecoder.h"
 #include "golomb.h"
 #include "mathops.h"
--- a/libavcodec/ffv1dec.c
+++ b/libavcodec/ffv1dec.c
@ -35,7 +35,6 @@
 #include "internal.h"
 #include "get_bits.h"
 #include "put_bits.h"
-#include "dsputil.h"
 #include "rangecoder.h"
 #include "golomb.h"
 #include "mathops.h"
--- a/libavcodec/ffv1enc.c
+++ b/libavcodec/ffv1enc.c
@ -34,7 +34,6 @@
 #include "avcodec.h"
 #include "internal.h"
 #include "put_bits.h"
-#include "dsputil.h"
 #include "rangecoder.h"
 #include "golomb.h"
 #include "mathops.h"
--- a/libavcodec/h261.c
+++ b/libavcodec/h261.c
@ -25,7 +25,6 @@
 * h261codec.
 */

-#include "dsputil.h"
 #include "avcodec.h"
 #include "h261.h"

--- a/libavcodec/h261dec.c
+++ b/libavcodec/h261dec.c
@ -26,7 +26,6 @@
 */

 #include "libavutil/avassert.h"
-#include "dsputil.h"
 #include "avcodec.h"
 #include "mpegvideo.h"
 #include "h263.h"
--- a/libavcodec/h261enc.c
+++ b/libavcodec/h261enc.c
@ -26,7 +26,6 @@
 */

 #include "libavutil/avassert.h"
-#include "dsputil.h"
 #include "avcodec.h"
 #include "mpegvideo.h"
 #include "h263.h"
--- a/libavcodec/h263.c
+++ b/libavcodec/h263.c
@ -30,7 +30,6 @@
 //#define DEBUG
 #include <limits.h>

-#include "dsputil.h"
 #include "avcodec.h"
 #include "mpegvideo.h"
 #include "h263.h"
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@ -30,7 +30,6 @@
 #include "libavutil/cpu.h"
 #include "internal.h"
 #include "avcodec.h"
-#include "dsputil.h"
 #include "mpegvideo.h"
 #include "h263.h"
 #include "h263_parser.h"
--- a/libavcodec/h264_cabac.c
+++ b/libavcodec/h264_cabac.c
@ -32,7 +32,6 @@
 #include "cabac.h"
 #include "cabac_functions.h"
 #include "internal.h"
-#include "dsputil.h"
 #include "avcodec.h"
 #include "h264.h"
 #include "h264data.h"
--- 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"
--- 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)
--- a/libavcodec/h264_refs.c
+++ b/libavcodec/h264_refs.c
@ -27,7 +27,6 @@

 #include "libavutil/avassert.h"
 #include "internal.h"
-#include "dsputil.h"
 #include "avcodec.h"
 #include "h264.h"
 #include "golomb.h"
--- a/libavcodec/h264pred.c
+++ b/libavcodec/h264pred.c
@ -26,8 +26,8 @@
 */

 #include "libavutil/avassert.h"
+#include "dsputil.h"
 #include "h264pred.h"
-#include "dsputil.h" // for ff_cropTbl
 #include "avcodec.h" // for AV_CODEC_ID_*

 #define BIT_DEPTH 8
--- 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)
--- 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"
--- 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"
--- 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"

--- a/libavcodec/ituh263dec.c
+++ b/libavcodec/ituh263dec.c
@ -34,7 +34,6 @@

 #include "libavutil/internal.h"
 #include "libavutil/mathematics.h"
-#include "dsputil.h"
 #include "avcodec.h"
 #include "mpegvideo.h"
 #include "h263.h"
--- a/libavcodec/ituh263enc.c
+++ b/libavcodec/ituh263enc.c
@ -30,7 +30,6 @@
 //#define DEBUG
 #include <limits.h>

-#include "dsputil.h"
 #include "avcodec.h"
 #include "mpegvideo.h"
 #include "h263.h"
--- 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"

--- a/libavcodec/jpeglsenc.c
+++ b/libavcodec/jpeglsenc.c
@ -31,7 +31,6 @@
 #include "golomb.h"
 #include "internal.h"
 #include "mathops.h"
-#include "dsputil.h"
 #include "mjpeg.h"
 #include "jpegls.h"

--- a/libavcodec/libxvid_rc.c
+++ b/libavcodec/libxvid_rc.c
@ -26,7 +26,6 @@
 #include "libavutil/file.h"
 #include "avcodec.h"
 #include "libxvid.h"
-//#include "dsputil.h"
 #include "mpegvideo.h"

 #undef NDEBUG
--- 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"
--- a/libavcodec/lpc.h
+++ b/libavcodec/lpc.h
@ -24,7 +24,6 @@

 #include <stdint.h>
 #include "libavutil/avassert.h"
-#include "dsputil.h"

 #define ORDER_METHOD_EST     0
 #define ORDER_METHOD_2LEVEL  1
--- 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"
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@ -35,7 +35,6 @@
 #include "libavutil/opt.h"
 #include "avcodec.h"
 #include "copy_block.h"
-#include "dsputil.h"
 #include "internal.h"
 #include "mjpeg.h"
 #include "mjpegdec.h"
--- a/libavcodec/mjpegenc.c
+++ b/libavcodec/mjpegenc.c
@ -31,7 +31,6 @@
 */

 #include "avcodec.h"
-#include "dsputil.h"
 #include "mpegvideo.h"
 #include "mjpeg.h"
 #include "mjpegenc.h"
--- a/libavcodec/motion_est.c
+++ b/libavcodec/motion_est.c
@ -32,7 +32,6 @@
 #include <limits.h>

 #include "avcodec.h"
-#include "dsputil.h"
 #include "mathops.h"
 #include "mpegvideo.h"

--- 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"

--- a/libavcodec/mpeg12enc.c
+++ b/libavcodec/mpeg12enc.c
@ -26,7 +26,6 @@
 */

 #include "avcodec.h"
-#include "dsputil.h"
 #include "mathops.h"
 #include "mpegvideo.h"

--- a/libavcodec/mpegaudiodec.c
+++ b/libavcodec/mpegaudiodec.c
@ -33,7 +33,6 @@
 #include "internal.h"
 #include "mathops.h"
 #include "mpegaudiodsp.h"
-#include "dsputil.h"

 /*
 * TODO:
--- a/libavcodec/mpegvideo_xvmc.c
+++ b/libavcodec/mpegvideo_xvmc.c
@ -23,7 +23,6 @@
 #include <X11/extensions/XvMC.h>

 #include "avcodec.h"
-#include "dsputil.h"
 #include "mpegvideo.h"

 #undef NDEBUG
--- a/libavcodec/msrle.c
+++ b/libavcodec/msrle.c
@ -33,7 +33,6 @@
 #include <string.h>

 #include "avcodec.h"
-#include "dsputil.h"
 #include "msrledec.h"

 typedef struct MsrleContext {
--- a/libavcodec/mss2dsp.h
+++ b/libavcodec/mss2dsp.h
@ -26,7 +26,7 @@
 #ifndef AVCODEC_MSS2DSP_H
 #define AVCODEC_MSS2DSP_H

-#include "dsputil.h"
+#include <stdint.h>

 typedef struct MSS2DSPContext {
    void (*mss2_blit_wmv9)(uint8_t *dst, int dst_stride,
--- 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"
--- 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"
--- 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"
--- a/libavcodec/nuv.c
+++ b/libavcodec/nuv.c
@ -28,7 +28,6 @@
 #include "libavutil/lzo.h"
 #include "libavutil/imgutils.h"
 #include "avcodec.h"
-#include "dsputil.h"
 #include "rtjpeg.h"

 typedef struct {
--- 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 ***** */
--- a/libavcodec/ppc/fdct_altivec.c
+++ b/libavcodec/ppc/fdct_altivec.c
@ -23,7 +23,6 @@
 #include <altivec.h>
 #endif
 #include "libavutil/common.h"
-#include "libavcodec/dsputil.h"
 #include "dsputil_altivec.h"

 #define vs16(v) ((vector signed short)(v))
--- 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"

 /*
--- a/libavcodec/ppc/idct_altivec.c
+++ b/libavcodec/ppc/idct_altivec.c
@ -42,7 +42,6 @@
 #include <altivec.h>
 #endif
 #include "libavutil/ppc/types_altivec.h"
-#include "libavcodec/dsputil.h"
 #include "dsputil_altivec.h"

 #define IDCT_HALF                                       \
--- 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"
--- 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
--- 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 =
--- 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"
--- a/libavcodec/ra288.h
+++ b/libavcodec/ra288.h
@ -23,7 +23,6 @@
 #define AVCODEC_RA288_H

 #include <stdint.h>
-#include "dsputil.h"
 #include "libavutil/common.h"

 static const float amptable[8]={
--- 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"
--- a/libavcodec/rectangle.h
+++ b/libavcodec/rectangle.h
@ -31,7 +31,6 @@
 #include "config.h"
 #include "libavutil/common.h"
 #include "libavutil/avassert.h"
-#include "dsputil.h"

 /**
 * fill a rectangle.
--- a/libavcodec/resample2.c
+++ b/libavcodec/resample2.c
@ -27,7 +27,6 @@

 #include "libavutil/avassert.h"
 #include "avcodec.h"
-#include "dsputil.h"
 #include "libavutil/common.h"

 #if FF_API_AVCODEC_RESAMPLE
--- 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];
--- 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) \
--- 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"
--- a/libavcodec/rv30.c
+++ b/libavcodec/rv30.c
@ -25,7 +25,6 @@
 */

 #include "avcodec.h"
-#include "dsputil.h"
 #include "mpegvideo.h"
 #include "golomb.h"

--- 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"
--- 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"
--- 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"

--- 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"

--- 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"

--- a/libavcodec/sparc/simple_idct_vis.c
+++ b/libavcodec/sparc/simple_idct_vis.c
@ -24,7 +24,6 @@

 #include <stdint.h>

-#include "libavcodec/dsputil.h"
 #include "dsputil_vis.h"
 #include "libavutil/mem.h"

--- 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"
--- a/libavcodec/svq3.c
+++ b/libavcodec/svq3.c
@ -40,7 +40,6 @@
 *  http://samples.mplayerhq.hu/V-codecs/SVQ3/Vertical400kbit.sorenson3.mov
 */
 #include "internal.h"
-#include "dsputil.h"
 #include "avcodec.h"
 #include "mpegvideo.h"
 #include "h264.h"
--- a/libavcodec/truemotion1.c
+++ b/libavcodec/truemotion1.c
@ -34,9 +34,9 @@
 #include <string.h>

 #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"
--- 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"
--- 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)
--- 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"
--- 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"
--- 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"

--- a/Show More
+++ b/Show More