Merge commit '1f3f896564501c23b44fcf605567c78ce066b539'

* commit '1f3f896564501c23b44fcf605567c78ce066b539':
  fate: Add dependencies for Vorbis, ProRes, QTRLE, utvideo tests
  fate: real: Add dependencies
  fate: lossless-audio: Add dependencies
  x86: h264dsp: Fix linking with yasm and optimizations disabled

Conflicts:
	libavcodec/x86/h264dsp_init.c
	tests/fate/lossless-audio.mak
	tests/fate/real.mak

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

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

diff --cc tests/fate/lossless-audio.mak
index e052a98,4808686..09d2df9
--- 1/tests/fate/lossless-audio.mak
--- 2/tests/fate/lossless-audio.mak
+++ b/tests/fate/lossless-audio.mak
@@@ -1,24 -1,17 +1,26 @@@
- FATE_SAMPLES_LOSSLESS_AUDIO += fate-lossless-alac
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, ALAC) += fate-lossless-alac
++FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, MOV, ALAC) += fate-lossless-alac
  fate-lossless-alac: CMD = md5 -i $(SAMPLES)/lossless-audio/inside.m4a -f s16le
  
- FATE_SAMPLES_LOSSLESS_AUDIO += fate-lossless-meridianaudio
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, MLP, MLP) += fate-lossless-meridianaudio
++FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, MLP, MLP) += fate-lossless-meridianaudio
  fate-lossless-meridianaudio: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.mlp -f s16le
  
- FATE_SAMPLES_LOSSLESS_AUDIO += fate-lossless-monkeysaudio
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, APE, APE) += fate-lossless-monkeysaudio
++FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, APE, APE) += fate-lossless-monkeysaudio
  fate-lossless-monkeysaudio: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.ape -f s16le
  
- FATE_SAMPLES_LOSSLESS_AUDIO += fate-lossless-shorten
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, SHORTEN, SHORTEN) += fate-lossless-shorten
++FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, SHORTEN, SHORTEN) += fate-lossless-shorten
  fate-lossless-shorten: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.shn -f s16le
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, TTA, TTA) += fate-lossless-tta
 +FATE_SAMPLES_LOSSLESS_AUDIO += fate-lossless-tak
 +fate-lossless-tak: CMD = crc -i $(SAMPLES)/lossless-audio/luckynight-partial.tak
 +
- FATE_SAMPLES_LOSSLESS_AUDIO += fate-lossless-tta
++FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, TTA, TTA) += fate-lossless-tta
  fate-lossless-tta: CMD = crc -i $(SAMPLES)/lossless-audio/inside.tta
  
- FATE_SAMPLES_LOSSLESS_AUDIO += fate-lossless-wma
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, WMALOSSLESS) += fate-lossless-wma
++FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, ASF, WMALOSSLESS) += fate-lossless-wma
  fate-lossless-wma: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.wma -f s16le
 +
++FATE_SAMPLES_LOSSLESS_AUDIO += $(FATE_SAMPLES_LOSSLESS_AUDIO-yes)
++
 +FATE_SAMPLES_FFMPEG += $(FATE_SAMPLES_LOSSLESS_AUDIO)
 +fate-lossless-audio: $(FATE_SAMPLES_LOSSLESS_AUDIO)
 +

diff --cc tests/fate/prores.mak
index 9f4d1b3,9c1a1b1..00e2159
--- 1/tests/fate/prores.mak
--- 2/tests/fate/prores.mak
+++ b/tests/fate/prores.mak
@@@ -4,11 -4,11 +4,11 @@@ FATE_PRORES = fate-prores-42
                fate-prores-422_proxy                                     \
                fate-prores-alpha                                         \
  
- FATE_SAMPLES_AVCONV += $(FATE_PRORES)
+ FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, PRORES) += $(FATE_PRORES)
  fate-prores: $(FATE_PRORES)
  
 -fate-prores-422:       CMD = framecrc -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422.mov -pix_fmt yuv422p10le
 -fate-prores-422_hq:    CMD = framecrc -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422_HQ.mov -pix_fmt yuv422p10le
 -fate-prores-422_lt:    CMD = framecrc -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422_LT.mov -pix_fmt yuv422p10le
 -fate-prores-422_proxy: CMD = framecrc -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422_Proxy.mov -pix_fmt yuv422p10le
 -fate-prores-alpha:     CMD = framecrc -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_with_Alpha.mov -pix_fmt yuv444p10le
 +fate-prores-422:       CMD = framecrc -flags +bitexact -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422.mov -pix_fmt yuv422p10le
 +fate-prores-422_hq:    CMD = framecrc -flags +bitexact -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422_HQ.mov -pix_fmt yuv422p10le
 +fate-prores-422_lt:    CMD = framecrc -flags +bitexact -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422_LT.mov -pix_fmt yuv422p10le
 +fate-prores-422_proxy: CMD = framecrc -flags +bitexact -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422_Proxy.mov -pix_fmt yuv422p10le
 +fate-prores-alpha:     CMD = framecrc -flags +bitexact -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_with_Alpha.mov -pix_fmt yuv444p10le

diff --cc tests/fate/real.mak
index 3ebbd9e,6063cf3..49b2eb4
--- 1/tests/fate/real.mak
--- 2/tests/fate/real.mak
+++ b/tests/fate/real.mak
@@@ -1,25 -1,25 +1,25 @@@
- FATE_REAL += fate-ra-144
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, RM, RA_144) += fate-ra-144
++FATE_REAL-$(call DEMDEC, RM, RA_144) += fate-ra-144
  fate-ra-144: CMD = md5 -i $(SAMPLES)/real/ra3_in_rm_file.rm -f s16le
  
- FATE_REAL += fate-ra-288
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, RM, RA_288) += fate-ra-288
++FATE_REAL-$(call DEMDEC, RM, RA_288) += fate-ra-288
  fate-ra-288: CMD = pcm -i $(SAMPLES)/real/ra_288.rm
  fate-ra-288: CMP = oneoff
  fate-ra-288: REF = $(SAMPLES)/real/ra_288.pcm
  fate-ra-288: FUZZ = 2
  
- FATE_REAL += fate-ra-cook
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, RM, COOK) += fate-ra-cook
++FATE_REAL-$(call DEMDEC, RM, COOK) += fate-ra-cook
  fate-ra-cook: CMD = pcm -i $(SAMPLES)/real/ra_cook.rm
  fate-ra-cook: CMP = oneoff
  fate-ra-cook: REF = $(SAMPLES)/real/ra_cook.pcm
  
- FATE_REAL += fate-ralf
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, RM, RALF) += fate-ralf
++FATE_REAL-$(call DEMDEC, RM, RALF) += fate-ralf
  fate-ralf: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.rmvb -vn -f s16le
  
- FATE_REAL += fate-rv30
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, RM, RV30) += fate-rv30
++FATE_REAL-$(call DEMDEC, RM, RV30) += fate-rv30
  fate-rv30: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i $(SAMPLES)/real/rv30.rm -an
  
- FATE_REAL += fate-rv40
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, RM, RV40) += fate-rv40
 -fate-rv40: CMD = framecrc -i $(SAMPLES)/real/spygames-2MB.rmvb -t 10 -an -vsync 0
++FATE_REAL-$(call DEMDEC, RM, RV40) += fate-rv40
 +fate-rv40: CMD = framecrc -i $(SAMPLES)/real/spygames-2MB.rmvb -t 10 -an
  
  FATE_SIPR += fate-sipr-5k0
  fate-sipr-5k0: CMD = pcm -i $(SAMPLES)/sipr/sipr_5k0.rm
@@@ -39,8 -39,5 +39,8 @@@ fate-sipr-16k: REF = $(SAMPLES)/sipr/si
  
  $(FATE_SIPR): CMP = oneoff
  
- FATE_REAL += $(FATE_SIPR)
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, RM, SIPR) += $(FATE_SIPR)
++FATE_REAL-$(call DEMDEC, RM, SIPR) += $(FATE_SIPR)
  fate-sipr: $(FATE_SIPR)
- FATE_SAMPLES_FFMPEG += $(FATE_REAL)
- fate-real: $(FATE_REAL)
 +
++FATE_SAMPLES_FFMPEG += $(FATE_REAL-yes)
++fate-real: $(FATE_REAL-yes)

diff --cc tests/fate/utvideo.mak
index 184a3be,004d8e0..44e0314
--- 1/tests/fate/utvideo.mak
--- 2/tests/fate/utvideo.mak
+++ b/tests/fate/utvideo.mak
@@@ -25,10 -25,10 +25,10 @@@ fate-utvideo_yuv422_left: CMD = framecr
  FATE_UTVIDEO += fate-utvideo_yuv422_median
  fate-utvideo_yuv422_median: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_yuv422_median.avi
  
- FATE_SAMPLES_AVCONV += $(FATE_UTVIDEO)
+ FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, UTVIDEO) += $(FATE_UTVIDEO)
  fate-utvideo: $(FATE_UTVIDEO)
  
 -fate-utvideoenc%: CMD = framemd5 -f image2 -vcodec pgmyuv -i $(TARGET_PATH)/tests/vsynth1/%02d.pgm -vcodec utvideo -f avi -sws_flags +accurate_rnd+bitexact ${OPTS}
 +fate-utvideoenc%: CMD = framemd5 -f image2 -vcodec pgmyuv -i $(TARGET_PATH)/tests/vsynth1/%02d.pgm -vcodec utvideo -sws_flags +accurate_rnd+bitexact ${OPTS}
  
  FATE_UTVIDEOENC += fate-utvideoenc_rgba_none
  fate-utvideoenc_rgba_none: OPTS = -pix_fmt rgba -pred 3