Merge commit '813b82b927b19532e3bc3397b972c8a27b9f6326'

* commit '813b82b927b19532e3bc3397b972c8a27b9f6326':
  configure: Fix silly typo in logging command of check_struct()
  fate: remove last incomplete frame from mpeg2-field-enc test

Conflicts:
	tests/fate/video.mak
	tests/ref/fate/mpeg2-field-enc

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

diff --cc configure
Simple merge

diff --cc tests/fate/video.mak
index 78049e5,30a06f0..1b835c7
--- 1/tests/fate/video.mak
--- 2/tests/fate/video.mak
+++ b/tests/fate/video.mak
@@@ -147,45 -142,39 +147,45 @@@ fate-iff-fibonacci: CMD = md5 -i $(SAMP
  FATE_IFF-$(CONFIG_IFF_ILBM_DECODER) += fate-iff-ilbm
  fate-iff-ilbm: CMD = framecrc -i $(SAMPLES)/iff/lms-matriks.ilbm -pix_fmt rgb24
  
 -FATE_SAMPLES_AVCONV-$(CONFIG_IFF_DEMUXER)  += $(FATE_IFF-yes)
 +FATE_VIDEO-$(CONFIG_IFF_DEMUXER)  += $(FATE_IFF-yes)
  fate-iff: $(FATE_IFF-yes)
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, IPMOVIE, INTERPLAY_VIDEO) += fate-interplay-mve-8bit
 +FATE_VIDEO-$(call DEMDEC, IPMOVIE, INTERPLAY_VIDEO) += fate-interplay-mve-8bit
  fate-interplay-mve-8bit: CMD = framecrc -i $(SAMPLES)/interplay-mve/interplay-logo-2MB.mve -pix_fmt rgb24 -an
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, IPMOVIE, INTERPLAY_VIDEO) += fate-interplay-mve-16bit
 +FATE_VIDEO-$(call DEMDEC, IPMOVIE, INTERPLAY_VIDEO) += fate-interplay-mve-16bit
  fate-interplay-mve-16bit: CMD = framecrc -i $(SAMPLES)/interplay-mve/descent3-level5-16bit-partial.mve -pix_fmt rgb24 -an
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, KGV1) += fate-kgv1
 +FATE_VIDEO-$(call DEMDEC, JV, JV) += fate-jv
 +fate-jv: CMD = framecrc -i $(SAMPLES)/jv/intro.jv -pix_fmt rgb24 -an
 +
 +FATE_VIDEO-$(call DEMDEC, AVI, KGV1) += fate-kgv1
  fate-kgv1: CMD = framecrc -i $(SAMPLES)/kega/kgv1.avi -pix_fmt rgb555le -an
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, KMVC) += fate-kmvc
 +FATE_VIDEO-$(call DEMDEC, AVI, KMVC) += fate-kmvc
  fate-kmvc: CMD = framecrc -i $(SAMPLES)/KMVC/LOGO1.AVI -an -t 3 -pix_fmt rgb24
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, EA, MDEC) += fate-mdec
 +FATE_VIDEO-$(call DEMDEC, EA, MDEC) += fate-mdec
  fate-mdec: CMD = framecrc -idct simple -i $(SAMPLES)/ea-dct/NFS2Esprit-partial.dct -an
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, STR, MDEC) += fate-mdec-v3
 +FATE_VIDEO-$(call DEMDEC, STR, MDEC) += fate-mdec-v3
  fate-mdec-v3: CMD = framecrc -idct simple -i $(SAMPLES)/psx-str/abc000_cut.str -an
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, MSNWC_TCP, MIMIC) += fate-mimic
 +FATE_VIDEO-$(call DEMDEC, MSNWC_TCP, MIMIC) += fate-mimic
  fate-mimic: CMD = framecrc -idct simple -i $(SAMPLES)/mimic/mimic2-womanloveffmpeg.cam
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, MJPEGB) += fate-mjpegb
 +FATE_VIDEO-$(call DEMDEC, MOV, MJPEGB) += fate-mjpegb
  fate-mjpegb: CMD = framecrc -idct simple -flags +bitexact -i $(SAMPLES)/mjpegb/mjpegb_part.mov -an
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, MVI, MOTIONPIXELS) += fate-motionpixels
 +FATE_VIDEO-$(call DEMDEC, MVI, MOTIONPIXELS) += fate-motionpixels
  fate-motionpixels: CMD = framecrc -i $(SAMPLES)/motion-pixels/INTRO-partial.MVI -an -pix_fmt rgb24 -vframes 111
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, MPEGTS, MPEG2VIDEO) += fate-mpeg2-field-enc
 +FATE_VIDEO-$(call DEMDEC, MPEGTS, MPEG2VIDEO) += fate-mpeg2-field-enc
- fate-mpeg2-field-enc: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -an
+ fate-mpeg2-field-enc: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -an -vframes 30
  
 +FATE_VIDEO-$(call DEMDEC, MXG, MXPEG) += fate-mxpeg
 +fate-mxpeg: CMD = framecrc -idct simple -flags +bitexact -i $(SAMPLES)/mxpeg/m1.mxg -an
 +
  # FIXME dropped frames in this test because of coarse timebase
  FATE_NUV += fate-nuv-rtjpeg
  fate-nuv-rtjpeg: CMD = framecrc -idct simple -i $(SAMPLES)/nuv/Today.nuv -an

diff --cc tests/ref/fate/mpeg2-field-enc
index 903adb5,e302536..bf8a01a
--- 1/tests/ref/fate/mpeg2-field-enc
--- 2/tests/ref/fate/mpeg2-field-enc
+++ b/tests/ref/fate/mpeg2-field-enc
@@@ -1,32 -1,31 +1,31 @@@
 -#tb 0: 1/90000
 -0,      32400,      32400,        0,   622080, 0xb3b66c5c
 -0,      36000,      36000,        0,   622080, 0x088ec02b
 -0,      39600,      39600,        0,   622080, 0x7a36db21
 -0,      43200,      43200,        0,   622080, 0x541b286f
 -0,      46800,      46800,        0,   622080, 0xb6c3e590
 -0,      50400,      50400,        0,   622080, 0x39dbed51
 -0,      54000,      54000,        0,   622080, 0x973dc728
 -0,      57600,      57600,        0,   622080, 0xd7a4f804
 -0,      61200,      61200,        0,   622080, 0xa2484762
 -0,      64800,      64800,        0,   622080, 0x0cd268d1
 -0,      68400,      68400,        0,   622080, 0x72eb663d
 -0,      72000,      72000,        0,   622080, 0x8fdbac59
 -0,      75600,      75600,        0,   622080, 0xa6f4feb9
 -0,      79200,      79200,        0,   622080, 0xadb828c6
 -0,      82800,      82800,        0,   622080, 0xea630a63
 -0,      86400,      86400,        0,   622080, 0xa901d925
 -0,      90000,      90000,        0,   622080, 0xac5e7087
 -0,      93600,      93600,        0,   622080, 0x10274a2b
 -0,      97200,      97200,        0,   622080, 0x143d541c
 -0,     100800,     100800,        0,   622080, 0xee94c93a
 -0,     104400,     104400,        0,   622080, 0xca030208
 -0,     108000,     108000,        0,   622080, 0x26f30ead
 -0,     111600,     111600,        0,   622080, 0xfc22f32c
 -0,     115200,     115200,        0,   622080, 0x940a5ff8
 -0,     118800,     118800,        0,   622080, 0x2164f805
 -0,     122400,     122400,        0,   622080, 0xa76f5aba
 -0,     126000,     126000,        0,   622080, 0x8c311471
 -0,     129600,     129600,        0,   622080, 0xa45e1d95
 -0,     133200,     133200,        0,   622080, 0x6cc61d6c
 -0,     136800,     136800,        0,   622080, 0x6983b417
 +#tb 0: 1/25
 +0,          9,          9,        1,   622080, 0xb3b66c5c
 +0,         10,         10,        1,   622080, 0x088ec02b
 +0,         11,         11,        1,   622080, 0x7a36db21
 +0,         12,         12,        1,   622080, 0x541b286f
 +0,         13,         13,        1,   622080, 0xb6c3e590
 +0,         14,         14,        1,   622080, 0x39dbed51
 +0,         15,         15,        1,   622080, 0x973dc728
 +0,         16,         16,        1,   622080, 0xd7a4f804
 +0,         17,         17,        1,   622080, 0xa2484762
 +0,         18,         18,        1,   622080, 0x0cd268d1
 +0,         19,         19,        1,   622080, 0x72eb663d
 +0,         20,         20,        1,   622080, 0x8fdbac59
 +0,         21,         21,        1,   622080, 0xa6f4feb9
 +0,         22,         22,        1,   622080, 0xadb828c6
 +0,         23,         23,        1,   622080, 0xea630a63
 +0,         24,         24,        1,   622080, 0xa901d925
 +0,         25,         25,        1,   622080, 0xac5e7087
 +0,         26,         26,        1,   622080, 0x10274a2b
 +0,         27,         27,        1,   622080, 0x143d541c
 +0,         28,         28,        1,   622080, 0xee94c93a
 +0,         29,         29,        1,   622080, 0xca030208
 +0,         30,         30,        1,   622080, 0x26f30ead
 +0,         31,         31,        1,   622080, 0xfc22f32c
 +0,         32,         32,        1,   622080, 0x940a5ff8
 +0,         33,         33,        1,   622080, 0x2164f805
 +0,         34,         34,        1,   622080, 0xa76f5aba
 +0,         35,         35,        1,   622080, 0x8c311471
 +0,         36,         36,        1,   622080, 0xa45e1d95
 +0,         37,         37,        1,   622080, 0x6cc61d6c
 +0,         38,         38,        1,   622080, 0x6983b417
- 0,         39,         39,        1,   622080, 0x982363c0