Merge commit '4d4d7cf9d539a053f531f662a972b23d335738eb'

* commit '4d4d7cf9d539a053f531f662a972b23d335738eb':
  fmvc: Add FATE tests

Merged-by: James Almer <jamrial@gmail.com>

diff --combined tests/fate/screen.mak
index 66dfa6ba7fa99bb4c701990a93443c36fff912ef,575d217d5a56927b588a2a6ec7f6b0c2acb3fb4d..68b4f6f979cdc57b9d04838ae685aa9adb78ffc8
--- 1/tests/fate/screen.mak
--- 2/tests/fate/screen.mak
+++ b/tests/fate/screen.mak
@@@ -1,13 -1,22 +1,22 @@@
  # FIXME dropped frames in this test because of coarse timebase
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, CSCD) += fate-cscd
 +FATE_SCREEN-$(call DEMDEC, AVI, CSCD) += fate-cscd
  fate-cscd: CMD = framecrc -i $(TARGET_SAMPLES)/CSCD/sample_video.avi -an -pix_fmt rgb24
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, DXTORY) += fate-dxtory
 +FATE_SCREEN-$(call DEMDEC, AVI, DXTORY) += fate-dxtory
  fate-dxtory: CMD = framecrc -i $(TARGET_SAMPLES)/dxtory/dxtory_mic.avi -an
  
  FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, FIC) += fate-fic-avi
  fate-fic-avi: CMD = framecrc -i $(TARGET_SAMPLES)/fic/fic-partial-2MB.avi -an
  
+ FATE_FMVC += fate-fmvc-type1
+ fate-fmvc-type1: CMD = framecrc -i $(TARGET_SAMPLES)/fmvc/6-methyl-5-hepten-2-one-CC-db_small.avi
+ 
+ FATE_FMVC += fate-fmvc-type2
+ fate-fmvc-type2: CMD = framecrc -i $(TARGET_SAMPLES)/fmvc/fmvcVirtualDub_small.avi
+ 
+ FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, FMVC) += $(FATE_FMVC)
+ fate-fmvc: $(FATE_FMVC)
+ 
  FATE_FRAPS += fate-fraps-v0
  fate-fraps-v0: CMD = framecrc -i $(TARGET_SAMPLES)/fraps/Griffin_Ragdoll01-partial.avi
  
@@@ -26,7 -35,7 +35,7 @@@ fate-fraps-v4: CMD = framecrc -i $(TARG
  FATE_FRAPS += fate-fraps-v5
  fate-fraps-v5: CMD = framecrc -i $(TARGET_SAMPLES)/fraps/fraps-v5-bouncing-balls-partial.avi
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, FRAPS) += $(FATE_FRAPS)
 +FATE_SCREEN-$(call DEMDEC, AVI, FRAPS) += $(FATE_FRAPS)
  fate-fraps: $(FATE_FRAPS)
  
  FATE_G2M += fate-g2m2
@@@ -80,7 -89,7 +89,7 @@@ fate-tscc-15bit: CMD = framecrc -i $(TA
  FATE_TSCC += fate-tscc-32bit
  fate-tscc-32bit: CMD = framecrc -i $(TARGET_SAMPLES)/tscc/2004-12-17-uebung9-partial.avi -pix_fmt rgb24 -an
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, TSCC) += $(FATE_TSCC)
 +FATE_SCREEN-$(call DEMDEC, AVI, TSCC) += $(FATE_TSCC)
  fate-tscc: $(FATE_TSCC)
  
  FATE_TSCC2-$(CONFIG_AVI_DEMUXER) += fate-tscc2-avi
@@@ -98,7 -107,7 +107,7 @@@ fate-vmnc-16bit: CMD = framecrc -i $(TA
  FATE_VMNC += fate-vmnc-32bit
  fate-vmnc-32bit: CMD = framecrc -i $(TARGET_SAMPLES)/VMnc/VS2k5DebugDemo-01-partial.avi -pix_fmt rgb24
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, VMNC) += $(FATE_VMNC)
 +FATE_SCREEN-$(call DEMDEC, AVI, VMNC) += $(FATE_VMNC)
  fate-vmnc: $(FATE_VMNC)
  
  FATE_ZMBV += fate-zmbv-8bit
@@@ -113,10 -122,5 +122,10 @@@ fate-zmbv-16bit: CMD = framecrc -i $(TA
  FATE_ZMBV += fate-zmbv-32bit
  fate-zmbv-32bit: CMD = framecrc -i $(TARGET_SAMPLES)/zmbv/zmbv_32bit.avi -pix_fmt rgb24 -t 25
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, ZMBV) += $(FATE_ZMBV)
 +FATE_SCREEN-$(call DEMDEC, AVI, ZMBV) += $(FATE_ZMBV)
  fate-zmbv: $(FATE_ZMBV)
 +
 +FATE_SCREEN += $(FATE_SCREEN-yes)
 +
 +FATE_SAMPLES_FFMPEG += $(FATE_SCREEN)
 +fate-screen: $(FATE_SCREEN)

diff --combined tests/ref/fate/fmvc-type1
index 0000000000000000000000000000000000000000,821866da7d94b89ee483cf65cfddd20b892f753a..d59de047e71095b194403c1812e43fd37e80968b
mode 000000,100644..100644
--- /dev/null
--- 2/tests/ref/fate/fmvc-type1
+++ b/tests/ref/fate/fmvc-type1
@@@ -1,0 -1,7 +1,11 @@@
+ #tb 0: 1/15
++#media_type 0: video
++#codec_id 0: rawvideo
++#dimensions 0: 664x382
++#sar 0: 0/1
+ 0,          0,          0,        1,   760944, 0x2feb1453
+ 0,          1,          1,        1,   760944, 0x9677ebf8
+ 0,          2,          2,        1,   760944, 0x83d2ed49
+ 0,          3,          3,        1,   760944, 0x9ab6c63d
+ 0,          4,          4,        1,   760944, 0x1820189c
+ 0,          5,          5,        1,   760944, 0x4b94f521

diff --combined tests/ref/fate/fmvc-type2
index 0000000000000000000000000000000000000000,32a307ea4f4a26eade04188d475b2f73df10b322..60c630803a42b171878d769e000a97d435b8be91
mode 000000,100644..100644
--- /dev/null
--- 2/tests/ref/fate/fmvc-type2
+++ b/tests/ref/fate/fmvc-type2
@@@ -1,0 -1,29 +1,33 @@@
+ #tb 0: 1/10
++#media_type 0: video
++#codec_id 0: rawvideo
++#dimensions 0: 768x576
++#sar 0: 0/1
+ 0,          0,          0,        1,  1327104, 0xa73c232d
+ 0,          1,          1,        1,  1327104, 0xa73c232d
+ 0,          2,          2,        1,  1327104, 0xa73c232d
+ 0,          3,          3,        1,  1327104, 0xf14e05be
+ 0,          4,          4,        1,  1327104, 0xd8c03726
+ 0,          5,          5,        1,  1327104, 0x16e8447a
+ 0,          6,          6,        1,  1327104, 0x8dfd94d2
+ 0,          7,          7,        1,  1327104, 0x3550833b
+ 0,          8,          8,        1,  1327104, 0x74bd2959
+ 0,          9,          9,        1,  1327104, 0xc2b4505c
+ 0,         10,         10,        1,  1327104, 0x7c6999cd
+ 0,         11,         11,        1,  1327104, 0xb6562711
+ 0,         12,         12,        1,  1327104, 0x50993565
+ 0,         13,         13,        1,  1327104, 0x579549d2
+ 0,         14,         14,        1,  1327104, 0xb17170f6
+ 0,         15,         15,        1,  1327104, 0xc7d87708
+ 0,         16,         16,        1,  1327104, 0xdb3879da
+ 0,         17,         17,        1,  1327104, 0xdb3879da
+ 0,         18,         18,        1,  1327104, 0xdb3879da
+ 0,         19,         19,        1,  1327104, 0x6f1c5c01
+ 0,         20,         20,        1,  1327104, 0xd9d15c01
+ 0,         21,         21,        1,  1327104, 0x826f0bab
+ 0,         22,         22,        1,  1327104, 0xf25b041d
+ 0,         23,         23,        1,  1327104, 0xc85a041d
+ 0,         24,         24,        1,  1327104, 0xc85a041d
+ 0,         25,         25,        1,  1327104, 0xc85a041d
+ 0,         26,         26,        1,  1327104, 0xc85a041d
+ 0,         27,         27,        1,  1327104, 0xc54cc6ae