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>

diff --cc libavcodec/aac.h
Simple merge

diff --cc libavcodec/aacdec.c
Simple merge

diff --cc libavcodec/aacenc.c
Simple merge

diff --cc libavcodec/aacenc.h
Simple merge

diff --cc libavcodec/aasc.c
Simple merge

diff --cc libavcodec/alacenc.c
Simple merge

diff --cc libavcodec/alpha/motion_est_alpha.c
Simple merge

diff --cc libavcodec/alpha/mpegvideo_alpha.c
Simple merge

diff --cc libavcodec/alpha/simple_idct_alpha.c
Simple merge

diff --cc libavcodec/arm/dsputil_init_arm.c
Simple merge

diff --cc libavcodec/arm/dsputil_init_armv5te.c
Simple merge

diff --cc libavcodec/arm/dsputil_init_armv6.c
Simple merge

diff --cc libavcodec/arm/dsputil_init_neon.c
Simple merge

diff --cc libavcodec/arm/h264dsp_init_arm.c
Simple merge

diff --cc libavcodec/arm/mpegvideo_arm.c
Simple merge

diff --cc libavcodec/arm/mpegvideo_armv5te.c
index 1765a65,2066cbc..a572290
--- 1/libavcodec/arm/mpegvideo_armv5te.c
--- 2/libavcodec/arm/mpegvideo_armv5te.c
+++ b/libavcodec/arm/mpegvideo_armv5te.c
@@@ -20,9 -20,7 +20,8 @@@
   */
  
  #include "libavutil/attributes.h"
 +#include "libavutil/avassert.h"
  #include "libavcodec/avcodec.h"
- #include "libavcodec/dsputil.h"
  #include "libavcodec/mpegvideo.h"
  #include "mpegvideo_arm.h"
  

diff --cc libavcodec/asv.c
Simple merge

diff --cc libavcodec/asvdec.c
Simple merge

diff --cc libavcodec/atrac.c
Simple merge

diff --cc libavcodec/atrac1.c
Simple merge

diff --cc libavcodec/bethsoftvideo.c
Simple merge

diff --cc libavcodec/bfin/mpegvideo_bfin.c
Simple merge

diff --cc libavcodec/binkaudio.c
Simple merge

diff --cc libavcodec/cyuv.c
Simple merge

diff --cc libavcodec/dv.c
Simple merge

diff --cc libavcodec/dvbsub_parser.c
Simple merge

diff --cc libavcodec/eaidct.c
Simple merge

diff --cc libavcodec/eamad.c
Simple merge

diff --cc libavcodec/eatqi.c
Simple merge

diff --cc libavcodec/error_resilience.c
Simple merge

diff --cc libavcodec/ffv1.c
index 29d76ed,d37230c..c75f2aa
--- 1/libavcodec/ffv1.c
--- 2/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@@ -26,14 -26,9 +26,13 @@@
   */
  
  #include "libavutil/avassert.h"
 +#include "libavutil/crc.h"
 +#include "libavutil/opt.h"
 +#include "libavutil/imgutils.h"
 +#include "libavutil/pixdesc.h"
 +#include "libavutil/timer.h"
  #include "avcodec.h"
 -#include "get_bits.h"
 -#include "put_bits.h"
 +#include "internal.h"
- #include "dsputil.h"
  #include "rangecoder.h"
  #include "golomb.h"
  #include "mathops.h"

diff --cc libavcodec/ffv1dec.c
Simple merge

diff --cc libavcodec/ffv1enc.c
index 2fe51c3,34191b7..70fcd65
--- 1/libavcodec/ffv1enc.c
--- 2/libavcodec/ffv1enc.c
+++ b/libavcodec/ffv1enc.c
@@@ -29,12 -29,11 +29,11 @@@
  #include "libavutil/crc.h"
  #include "libavutil/opt.h"
  #include "libavutil/imgutils.h"
 +#include "libavutil/pixdesc.h"
 +#include "libavutil/timer.h"
  #include "avcodec.h"
  #include "internal.h"
 -#include "get_bits.h"
  #include "put_bits.h"
- #include "dsputil.h"
  #include "rangecoder.h"
  #include "golomb.h"
  #include "mathops.h"

diff --cc libavcodec/h261.c
Simple merge

diff --cc libavcodec/h261dec.c
index a376116,35d5002..eebfd02
--- 1/libavcodec/h261dec.c
--- 2/libavcodec/h261dec.c
+++ b/libavcodec/h261dec.c
@@@ -25,8 -25,6 +25,7 @@@
   * H.261 decoder.
   */
  
- #include "dsputil.h"
 +#include "libavutil/avassert.h"
  #include "avcodec.h"
  #include "mpegvideo.h"
  #include "h263.h"

diff --cc libavcodec/h261enc.c
index edf01f9,88b0796..c22100c
--- 1/libavcodec/h261enc.c
--- 2/libavcodec/h261enc.c
+++ b/libavcodec/h261enc.c
@@@ -25,8 -25,6 +25,7 @@@
   * H.261 encoder.
   */
  
- #include "dsputil.h"
 +#include "libavutil/avassert.h"
  #include "avcodec.h"
  #include "mpegvideo.h"
  #include "h263.h"

diff --cc libavcodec/h263.c
Simple merge

diff --cc libavcodec/h263dec.c
Simple merge

diff --cc libavcodec/h264_cabac.c
Simple merge

diff --cc libavcodec/h264_direct.c
Simple merge

diff --cc libavcodec/h264_ps.c
Simple merge

diff --cc libavcodec/h264_refs.c
index 5736e15,ead18c5..d87106e
--- 1/libavcodec/h264_refs.c
--- 2/libavcodec/h264_refs.c
+++ b/libavcodec/h264_refs.c
@@@ -25,9 -25,7 +25,8 @@@
   * @author Michael Niedermayer <michaelni@gmx.at>
   */
  
 +#include "libavutil/avassert.h"
  #include "internal.h"
- #include "dsputil.h"
  #include "avcodec.h"
  #include "h264.h"
  #include "golomb.h"

diff --cc libavcodec/h264pred.c
index 1339b2a,15f2112..e5f1f5a
--- 1/libavcodec/h264pred.c
--- 2/libavcodec/h264pred.c
+++ b/libavcodec/h264pred.c
@@@ -25,10 -25,8 +25,10 @@@
   * @author Michael Niedermayer <michaelni@gmx.at>
   */
  
 +#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
  #include "h264pred_template.c"

diff --cc libavcodec/huffyuv.c
Simple merge

diff --cc libavcodec/huffyuvdec.c
Simple merge

diff --cc libavcodec/indeo4.c
Simple merge

diff --cc libavcodec/intrax8dsp.c
Simple merge

diff --cc libavcodec/ituh263dec.c
Simple merge

diff --cc libavcodec/ituh263enc.c
Simple merge

diff --cc libavcodec/ivi_dsp.c
Simple merge

diff --cc libavcodec/jpeglsenc.c
Simple merge

diff --cc libavcodec/libxvid_rc.c
index 93aeb71,dd4cff2..4a5842f
--- 1/libavcodec/libxvid_rc.c
--- 2/libavcodec/libxvid_rc.c
+++ b/libavcodec/libxvid_rc.c
@@@ -23,10 -23,12 +23,9 @@@
  #include "config.h"
  #include <xvid.h>
  #include <unistd.h>
 -#if !HAVE_MKSTEMP
 -#include <fcntl.h>
 -#endif
 -
 +#include "libavutil/file.h"
  #include "avcodec.h"
  #include "libxvid.h"
- //#include "dsputil.h"
  #include "mpegvideo.h"
  
  #undef NDEBUG

diff --cc libavcodec/ljpegenc.c
Simple merge

diff --cc libavcodec/lpc.h
index 24f776a,c41a1f8..8fa56ad
--- 1/libavcodec/lpc.h
--- 2/libavcodec/lpc.h
+++ b/libavcodec/lpc.h
@@@ -23,8 -23,6 +23,7 @@@
  #define AVCODEC_LPC_H
  
  #include <stdint.h>
- #include "dsputil.h"
 +#include "libavutil/avassert.h"
  
  #define ORDER_METHOD_EST     0
  #define ORDER_METHOD_2LEVEL  1

diff --cc libavcodec/mdec.c
Simple merge

diff --cc libavcodec/mjpegdec.c
index 4fd0ad9,470529f..ba5753b
--- 1/libavcodec/mjpegdec.c
--- 2/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@@ -30,12 -30,12 +30,11 @@@
   * MJPEG decoder.
   */
  
 -// #define DEBUG
 -#include <assert.h>
 -
  #include "libavutil/imgutils.h"
 +#include "libavutil/avassert.h"
  #include "libavutil/opt.h"
  #include "avcodec.h"
- #include "dsputil.h"
 +#include "copy_block.h"
  #include "internal.h"
  #include "mjpeg.h"
  #include "mjpegdec.h"

diff --cc libavcodec/mjpegenc.c
index 2a92dbd,2a83a20..80a4022
--- 1/libavcodec/mjpegenc.c
--- 2/libavcodec/mjpegenc.c
+++ b/libavcodec/mjpegenc.c
@@@ -30,8 -30,10 +30,7 @@@
   * MJPEG encoder.
   */
  
 -//#define DEBUG
 -#include <assert.h>
 -
  #include "avcodec.h"
- #include "dsputil.h"
  #include "mpegvideo.h"
  #include "mjpeg.h"
  #include "mjpegenc.h"

diff --cc libavcodec/motion_est.c
Simple merge

diff --cc libavcodec/mpc.c
Simple merge

diff --cc libavcodec/mpeg12enc.c
Simple merge

diff --cc libavcodec/mpegaudiodec.c
Simple merge

diff --cc libavcodec/mpegvideo_xvmc.c
Simple merge

diff --cc libavcodec/msrle.c
Simple merge

diff --cc libavcodec/mss2dsp.h
Simple merge

diff --cc libavcodec/nellymoserdec.c
Simple merge

diff --cc libavcodec/nellymoserenc.c
Simple merge

diff --cc libavcodec/nuv.c
Simple merge

diff --cc libavcodec/ppc/dsputil_ppc.c
Simple merge

diff --cc libavcodec/ppc/fdct_altivec.c
Simple merge

diff --cc libavcodec/ppc/gmc_altivec.c
Simple merge

diff --cc libavcodec/ppc/idct_altivec.c
Simple merge

diff --cc libavcodec/ppc/mpegvideo_altivec.c
Simple merge

diff --cc libavcodec/ppc/vc1dsp_altivec.c
Simple merge

diff --cc libavcodec/ppc/vp3dsp_altivec.c
Simple merge

diff --cc libavcodec/qdm2.c
Simple merge

diff --cc libavcodec/ra288.h
Simple merge

diff --cc libavcodec/ratecontrol.c
Simple merge

diff --cc libavcodec/rectangle.h
index 2ce80e1,73e8b0a..594a760
--- 1/libavcodec/rectangle.h
--- 2/libavcodec/rectangle.h
+++ b/libavcodec/rectangle.h
@@@ -28,10 -28,9 +28,9 @@@
  #ifndef AVCODEC_RECTANGLE_H
  #define AVCODEC_RECTANGLE_H
  
 -#include <assert.h>
  #include "config.h"
  #include "libavutil/common.h"
- #include "dsputil.h"
 +#include "libavutil/avassert.h"
  
  /**
   * fill a rectangle.

diff --cc libavcodec/resample2.c
index 4cdb0e5,5b6e855..9b63b53
--- 1/libavcodec/resample2.c
--- 2/libavcodec/resample2.c
+++ b/libavcodec/resample2.c
@@@ -25,9 -25,7 +25,8 @@@
   * @author Michael Niedermayer <michaelni@gmx.at>
   */
  
 +#include "libavutil/avassert.h"
  #include "avcodec.h"
- #include "dsputil.h"
  #include "libavutil/common.h"
  
  #if FF_API_AVCODEC_RESAMPLE

diff --cc libavcodec/roqvideo.h
Simple merge

diff --cc libavcodec/rtjpeg.c
Simple merge

diff --cc libavcodec/rv10.c
Simple merge

diff --cc libavcodec/rv30.c
Simple merge

diff --cc libavcodec/rv30dsp.c
Simple merge

diff --cc libavcodec/rv34.h
Simple merge

diff --cc libavcodec/rv40.c
Simple merge

diff --cc libavcodec/sh4/idct_sh4.c
Simple merge

diff --cc libavcodec/sipr.h
Simple merge

diff --cc libavcodec/sparc/simple_idct_vis.c
Simple merge

diff --cc libavcodec/svq1enc.c
Simple merge

diff --cc libavcodec/svq3.c
index 8f910b5,04c1858..0481c80
--- 1/libavcodec/svq3.c
--- 2/libavcodec/svq3.c
+++ b/libavcodec/svq3.c
@@@ -37,10 -37,9 +37,9 @@@
   *
   * You will know you have these parameters passed correctly when the decoder
   * correctly decodes this file:
 - *  http://samples.libav.org/V-codecs/SVQ3/Vertical400kbit.sorenson3.mov
 + *  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"

diff --cc libavcodec/truemotion1.c
Simple merge

diff --cc libavcodec/twinvq.c
Simple merge

diff --cc libavcodec/vaapi_mpeg2.c
Simple merge

diff --cc libavcodec/vc1.c
Simple merge

diff --cc libavcodec/vc1dec.c
Simple merge

diff --cc libavcodec/vcr1.c
Simple merge

diff --cc libavcodec/vorbis_data.c
Simple merge

diff --cc libavcodec/vorbisenc.c
Simple merge

diff --cc libavcodec/vp5.c
Simple merge

diff --cc libavcodec/vp6.c
Simple merge

diff --cc libavcodec/wma.h
Simple merge

diff --cc libavcodec/wmaprodec.c
Simple merge

diff --cc libavcodec/wmv2.h
Simple merge

diff --cc libavcodec/wmv2dec.c
Simple merge

diff --cc libavcodec/wmv2enc.c
Simple merge

diff --cc libavcodec/x86/cavsdsp.c
Simple merge

diff --cc libavcodec/x86/fft_init.c
Simple merge

diff --cc libavcodec/x86/fmtconvert_init.c
Simple merge

diff --cc libavcodec/x86/h264_qpel.c
Simple merge

diff --cc libavcodec/x86/idct_sse2_xvid.c
index 09b9e40,207af6b..b51466c
--- 1/libavcodec/x86/idct_sse2_xvid.c
--- 2/libavcodec/x86/idct_sse2_xvid.c
+++ b/libavcodec/x86/idct_sse2_xvid.c
@@@ -38,7 -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"
  #include "idct_xvid.h"

diff --cc libavcodec/x86/motion_est.c
index 6706593,103a998..3ffb002
--- 1/libavcodec/x86/motion_est.c
--- 2/libavcodec/x86/motion_est.c
+++ b/libavcodec/x86/motion_est.c
@@@ -23,10 -23,9 +23,9 @@@
   */
  
  #include "libavutil/attributes.h"
 -#include "libavutil/internal.h"
 +#include "libavutil/avassert.h"
  #include "libavutil/mem.h"
  #include "libavutil/x86/asm.h"
- #include "libavcodec/dsputil.h"
  #include "dsputil_mmx.h"
  
  #if HAVE_INLINE_ASM

diff --cc libavcodec/x86/mpegvideo.c
Simple merge

diff --cc libavcodec/x86/simple_idct.c
index f9fd7dc,f31f7f4..f27d2b9
--- 1/libavcodec/x86/simple_idct.c
--- 2/libavcodec/x86/simple_idct.c
+++ b/libavcodec/x86/simple_idct.c
@@@ -16,11 -16,11 +16,10 @@@
   * Lesser General Public License for more details.
   *
   * You should have received a copy of the GNU Lesser General Public
 - * License along with Libav; if not, write to the Free Software
 + * License along with FFmpeg; 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"
  #include "dsputil_mmx.h"
  

diff --cc libavcodec/x86/vc1dsp_mmx.c
Simple merge

diff --cc libavcodec/x86/vp56dsp_init.c
Simple merge