Merge commit 'a846dccb29d2bb0798af1d47d06100eda9ca87cc'

* commit 'a846dccb29d2bb0798af1d47d06100eda9ca87cc':
  h264chroma: x86: Fix building with yasm disabled
  rv34: Drop now unnecessary dsputil dependencies

Conflicts:
	libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

diff --cc libavcodec/rv30dsp.c
Simple merge

diff --cc libavcodec/rv34.c
Simple merge

diff --cc libavcodec/rv40dsp.c
index 99b458c8f04e086aed9b7f89f5c2d1e81db47dbc,589e3c6f38589b7b8b07a49efea41527f5f1c817..cea4552a513e4f7a7e0376a741921eef9f0f87c3
--- 1/libavcodec/rv40dsp.c
--- 2/libavcodec/rv40dsp.c
+++ b/libavcodec/rv40dsp.c
@@@ -25,10 -25,8 +25,9 @@@
   */
  
  #include "avcodec.h"
- #include "dsputil.h"
  #include "h264qpel.h"
  #include "rv34dsp.h"
 +#include "libavutil/avassert.h"
  #include "libavutil/common.h"
  
  #define RV40_LOWPASS(OPNAME, OP) \

diff --cc libavcodec/x86/Makefile
index 111fdedf470bddcd2978346cd6efd51c1873c491,c740573a9fe69015100788b9a0492dc53a80ced4..30264d78c6ef6da94a82201a26d8635afd1dbb33
--- 1/libavcodec/x86/Makefile
--- 2/libavcodec/x86/Makefile
+++ b/libavcodec/x86/Makefile
@@@ -5,7 -5,7 +5,8 @@@ OBJS-$(CONFIG_AC3DSP)                  
  OBJS-$(CONFIG_CAVS_DECODER)            += x86/cavsdsp.o
  OBJS-$(CONFIG_DNXHD_ENCODER)           += x86/dnxhdenc.o
  OBJS-$(CONFIG_FFT)                     += x86/fft_init.o
 +OBJS-$(CONFIG_GPL)                     += x86/idct_mmx.o
+ OBJS-$(CONFIG_H264CHROMA)              += x86/h264chroma_init.o
  OBJS-$(CONFIG_H264DSP)                 += x86/h264dsp_init.o
  OBJS-$(CONFIG_H264PRED)                += x86/h264_intrapred_init.o
  OBJS-$(CONFIG_H264QPEL)                += x86/h264_qpel.o
@@@ -47,12 -42,9 +48,11 @@@ MMX-OBJS-$(CONFIG_VC1_DECODER)         
  YASM-OBJS-$(CONFIG_AAC_DECODER)        += x86/sbrdsp.o
  YASM-OBJS-$(CONFIG_AC3DSP)             += x86/ac3dsp.o
  YASM-OBJS-$(CONFIG_DCT)                += x86/dct32.o
 +YASM-OBJS-$(CONFIG_DIRAC_DECODER)      += x86/diracdsp_mmx.o x86/diracdsp_yasm.o\
 +                                          x86/dwt_yasm.o
  YASM-OBJS-$(CONFIG_ENCODERS)           += x86/dsputilenc.o
  YASM-OBJS-$(CONFIG_FFT)                += x86/fft.o
- YASM-OBJS-$(CONFIG_H264CHROMA)         += x86/h264chroma_init.o         \
-                                           x86/h264_chromamc.o           \
+ YASM-OBJS-$(CONFIG_H264CHROMA)         += x86/h264_chromamc.o           \
                                            x86/h264_chromamc_10bit.o
  YASM-OBJS-$(CONFIG_H264DSP)            += x86/h264_deblock.o            \
                                            x86/h264_deblock_10bit.o      \

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

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