From: Michael Niedermayer <michaelni@gmx.at>
Date: Sun, 17 Nov 2013 00:20:45 +0000 (+0100)
Subject: Merge commit '952f943d40e9dbcd68bc851460cc99268091a294'
X-Git-Tag: android-x86-6.0-r1~8958
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=10ac6f3ce9ae4065a5b72ddfaded45f75b357518;p=android-x86%2Fexternal-ffmpeg.git

Merge commit '952f943d40e9dbcd68bc851460cc99268091a294'

* commit '952f943d40e9dbcd68bc851460cc99268091a294':
  FATE: add a jv test

Conflicts:
	tests/fate/video.mak
	tests/ref/fate/jv

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

10ac6f3ce9ae4065a5b72ddfaded45f75b357518
diff --cc tests/fate/video.mak
index 43bfe5edb3,34b385a578..d00df1e405
--- a/tests/fate/video.mak
+++ b/tests/fate/video.mak
@@@ -150,48 -145,45 +150,48 @@@ fate-iff-fibonacci: CMD = md5 -i $(TARG
  FATE_IFF-$(CONFIG_IFF_ILBM_DECODER) += fate-iff-ilbm
  fate-iff-ilbm: CMD = framecrc -i $(TARGET_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 $(TARGET_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 $(TARGET_SAMPLES)/interplay-mve/descent3-level5-16bit-partial.mve -pix_fmt rgb24 -an
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, MXF, JPEG2000) += fate-jpeg2000-dcinema
 +FATE_VIDEO-$(call DEMDEC, MXF, JPEG2000) += fate-jpeg2000-dcinema
  fate-jpeg2000-dcinema: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/chiens_dcinema2K.mxf -pix_fmt xyz12le
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, JV, JV) += fate-jv
 +FATE_VIDEO-$(call DEMDEC, JV, JV) += fate-jv
- fate-jv: CMD = framecrc -i $(TARGET_SAMPLES)/jv/intro.jv -pix_fmt rgb24 -an
+ fate-jv: CMD = framecrc -i $(TARGET_SAMPLES)/jv/intro.jv -an -pix_fmt rgb24
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, KGV1) += fate-kgv1
 +FATE_VIDEO-$(call DEMDEC, AVI, KGV1) += fate-kgv1
  fate-kgv1: CMD = framecrc -i $(TARGET_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 $(TARGET_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 $(TARGET_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 $(TARGET_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 $(TARGET_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 $(TARGET_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 $(TARGET_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 -idct simple -i $(TARGET_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 $(TARGET_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 $(TARGET_SAMPLES)/nuv/Today.nuv -an