diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-20 12:37:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-20 12:37:52 +0200 |
| commit | 04c6ecb7da677049cd52efe2a980e586167e9e5d (patch) | |
| tree | 1a8279cffbc9424ade212f660d0c99314230011a /tests/fate/microsoft.mak | |
| parent | cdea54b4c8cd891aa12f85c41b0cd4bd81be83f9 (diff) | |
| parent | c9ef43215c7d68c2cdcdbe02287aa114f27a32ed (diff) | |
| download | ffmpeg-04c6ecb7da677049cd52efe2a980e586167e9e5d.tar.gz | |
Merge commit 'c9ef43215c7d68c2cdcdbe02287aa114f27a32ed'
* commit 'c9ef43215c7d68c2cdcdbe02287aa114f27a32ed':
fate-vc1: add dependencies
ARM: fix overreads in neon h264 chroma mc
rtsp: Make sure the ret variable is initialized in ff_rtsp_fetch_packet
gitignore: ignore files created by msvc
fate: Add proper dependencies for the tests in video.mak
configure: Disable Snow decoder and encoder by default
lzo: Drop obsolete fast_memcpy reference
build: Drop OBJS declaration for non-existing PCM_DVD encoder
mpeg4videodec: Disable frame multithreading for GMC, its not implemented at all
Conflicts:
libavcodec/mpegvideo.c
libavformat/rtsp.c
tests/fate/microsoft.mak
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/microsoft.mak')
| -rw-r--r-- | tests/fate/microsoft.mak | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/fate/microsoft.mak b/tests/fate/microsoft.mak index 7d8e6a8355..a2b3f1f228 100644 --- a/tests/fate/microsoft.mak +++ b/tests/fate/microsoft.mak @@ -24,26 +24,26 @@ fate-wmv8-x8intra: CMD = framecrc -flags +bitexact -idct 19 -i $(SAMPLES)/wmv8/w FATE_MICROSOFT-$(call DEMDEC, ASF, WMV3) += $(FATE_WMV8_DRM) fate-wmv8_drm: $(FATE_WMV8_DRM) -FATE_VC1 += fate-vc1_sa00040 +FATE_VC1-$(CONFIG_VC1_DEMUXER) += fate-vc1_sa00040 fate-vc1_sa00040: CMD = framecrc -i $(SAMPLES)/vc1/SA00040.vc1 -FATE_VC1 += fate-vc1_sa00050 +FATE_VC1-$(CONFIG_VC1_DEMUXER) += fate-vc1_sa00050 fate-vc1_sa00050: CMD = framecrc -i $(SAMPLES)/vc1/SA00050.vc1 -FATE_VC1 += fate-vc1_sa10091 +FATE_VC1-$(CONFIG_VC1_DEMUXER) += fate-vc1_sa10091 fate-vc1_sa10091: CMD = framecrc -i $(SAMPLES)/vc1/SA10091.vc1 -FATE_VC1 += fate-vc1_sa20021 +FATE_VC1-$(CONFIG_VC1_DEMUXER) += fate-vc1_sa20021 fate-vc1_sa20021: CMD = framecrc -i $(SAMPLES)/vc1/SA20021.vc1 -FATE_VC1 += fate-vc1_sa10143 +FATE_VC1-$(CONFIG_VC1_DEMUXER) += fate-vc1_sa10143 fate-vc1_sa10143: CMD = framecrc -i $(SAMPLES)/vc1/SA10143.vc1 -FATE_VC1 += fate-vc1-ism +FATE_VC1-$(CONFIG_MOV_DEMUXER) += fate-vc1-ism fate-vc1-ism: CMD = framecrc -i $(SAMPLES)/isom/vc1-wmapro.ism -an -FATE_MICROSOFT += $(FATE_VC1) -fate-vc1: $(FATE_VC1) +FATE_MICROSOFT-$(CONFIG_VC1_DECODER) += $(FATE_VC1-yes) +fate-vc1: $(FATE_VC1-yes) FATE_MICROSOFT += $(FATE_MICROSOFT-yes) |