@@ -21,7 +21,6 @@

 #include "libavutil/attributes.h"

 #include "libavutil/cpu.h"

 #include "libavutil/arm/cpu.h"

-#include "libavcodec/dsputil.h"

 #include "libavcodec/vp3dsp.h"

 void ff_vp3_idct_put_neon(uint8_t *dest, int line_size, int16_t *data);

@@ -25,7 +25,6 @@

  */

 #include "libavutil/attributes.h"

-#include "dsputil.h"

 #include "binkdsp.h"

 #define A1  2896 /* (1/sqrt(2))<<12 */

@@ -18,8 +18,8 @@

  * License along with Libav; if not, write to the Free Software

  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

  */

+

 #include "avcodec.h"

-#include "dsputil.h"

 #include "get_bits.h"

 #include "bytestream.h"

 #include "libavutil/colorspace.h"

@@ -18,9 +18,9 @@

  * License along with Libav; if not, write to the Free Software

  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

  */

+

 #include "avcodec.h"

 #include "get_bits.h"

-#include "dsputil.h"

 #include "internal.h"

 #include "libavutil/attributes.h"

@@ -26,7 +26,8 @@

  */

 #include "libavutil/attributes.h"

-#include "dsputil.h"

+#include "libavutil/intreadwrite.h"

+#include "avcodec.h"

 #include "h264pred.h"

 #define BIT_DEPTH 8

@@ -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 "indeo5data.h"

@@ -28,7 +28,6 @@

 #include "libavutil/attributes.h"

 #include "internal.h"

 #include "avcodec.h"

-#include "dsputil.h"

 #include "mpegvideo.h"

 #include "error_resilience.h"

 #include "mpeg12.h"

@@ -23,7 +23,6 @@

  */

 #include "avcodec.h"

-#include "dsputil.h"

 #include "mpegutils.h"

 #include "mpegvideo.h"

 #include "msmpeg4.h"

@@ -27,7 +27,6 @@

 #include "avcodec.h"

 #include "bytestream.h"

-#include "dsputil.h"

 #include "get_bits.h"

 #include "internal.h"

 #include "mss34dsp.h"

@@ -26,6 +26,7 @@

  */

 #include "libavutil/common.h"

+#include "dsputil.h"

 #include "h264chroma.h"

 #include "vc1dsp.h"

@@ -28,7 +28,6 @@

 #ifndef AVCODEC_VC1DSP_H

 #define AVCODEC_VC1DSP_H

-#include "dsputil.h"

 #include "hpeldsp.h"

 #include "h264chroma.h"

@@ -25,11 +25,11 @@

  */

 #include "libavutil/attributes.h"

+#include "libavutil/intreadwrite.h"

 #include "libavutil/common.h"

 #include "libavutil/intreadwrite.h"

 #include "avcodec.h"

-#include "dsputil.h"

 #include "rnd_avg.h"

 #include "vp3dsp.h"

@@ -26,7 +26,6 @@

 #ifndef AVCODEC_VP56_H

 #define AVCODEC_VP56_H

-#include "dsputil.h"

 #include "get_bits.h"

 #include "hpeldsp.h"

 #include "bytestream.h"

@@ -22,7 +22,6 @@

 #include "libavutil/cpu.h"

 #include "libavutil/x86/cpu.h"

 #include "libavcodec/avcodec.h"

-#include "libavcodec/dsputil.h"

 #include "libavcodec/vp3dsp.h"

 #include "config.h"