From: Hendrik Leppkes <h.leppkes@gmail.com>
Date: Fri, 16 Oct 2015 21:00:11 +0000 (+0200)
Subject: Merge commit '1f84b008bf2b1eaca473937c48788cb4e4ce1aea'
X-Git-Tag: android-x86-7.1-r1~8481
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ba94e985a33d8e0feb545b09854e711a331c5343;p=android-x86%2Fexternal-ffmpeg.git

Merge commit '1f84b008bf2b1eaca473937c48788cb4e4ce1aea'

* commit '1f84b008bf2b1eaca473937c48788cb4e4ce1aea':
  fate: Move screenpresso to the appropriate screen capture file

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
---

ba94e985a33d8e0feb545b09854e711a331c5343
diff --cc tests/fate/video.mak
index a0a70792e2,ef1d41da2f..d128c7548f
--- a/tests/fate/video.mak
+++ b/tests/fate/video.mak
@@@ -265,49 -254,49 +265,46 @@@ fate-nuv-rtjpeg: CMD = framecrc -idct s
  FATE_NUV += fate-nuv-rtjpeg-fh
  fate-nuv-rtjpeg-fh: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/nuv/rtjpeg_frameheader.nuv -an
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, NUV, NUV) += $(FATE_NUV)
 +FATE_VIDEO-$(call DEMDEC, NUV, NUV) += $(FATE_NUV)
  fate-nuv: $(FATE_NUV)
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, PAF, PAF_VIDEO) += fate-paf-video
 +FATE_VIDEO-$(call DEMDEC, PAF, PAF_VIDEO) += fate-paf-video
  fate-paf-video: CMD = framecrc -i $(TARGET_SAMPLES)/paf/hod1-partial.paf -pix_fmt rgb24 -an
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, QPEG) += fate-qpeg
 +FATE_VIDEO-$(call DEMDEC, AVI, QPEG) += fate-qpeg
  fate-qpeg: CMD = framecrc -i $(TARGET_SAMPLES)/qpeg/Clock.avi -an -pix_fmt rgb24
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, R210) += fate-r210
 +FATE_VIDEO-$(call DEMDEC, AVI, R210) += fate-r210
  fate-r210: CMD = framecrc -i $(TARGET_SAMPLES)/r210/r210.avi -pix_fmt rgb48le
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, RL2, RL2) += fate-rl2
 +FATE_VIDEO-$(call DEMDEC, RL2, RL2) += fate-rl2
  fate-rl2: CMD = framecrc -i $(TARGET_SAMPLES)/rl2/Z4915300.RL2 -pix_fmt rgb24 -an
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, ROQ, ROQ) += fate-roqvideo
 +FATE_VIDEO-$(call DEMDEC, ROQ, ROQ) += fate-roqvideo
  fate-roqvideo: CMD = framecrc -i $(TARGET_SAMPLES)/idroq/idlogo.roq -an
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, SMUSH, SANM) += fate-sanm
 +FATE_VIDEO-$(call DEMDEC, SMUSH, SANM) += fate-sanm
  fate-sanm: CMD = framecrc -i $(TARGET_SAMPLES)/smush/ronin_part.znm -an -pix_fmt rgb24
  
- FATE_VIDEO-$(call DEMDEC, AVI, SCREENPRESSO) += fate-screenpresso
- fate-screenpresso: CMD = framecrc -i $(TARGET_SAMPLES)/spv1/bunny.avi
- 
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, VMD, VMDVIDEO) += fate-sierra-vmd-video
 +FATE_VIDEO-$(call DEMDEC, VMD, VMDVIDEO) += fate-sierra-vmd-video
  fate-sierra-vmd-video: CMD = framecrc -i $(TARGET_SAMPLES)/vmd/12.vmd -pix_fmt rgb24 -an
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, SMACKER, SMACKER) += fate-smacker-video
 +FATE_VIDEO-$(call DEMDEC, SMACKER, SMACKER) += fate-smacker-video
  fate-smacker-video: CMD = framecrc -i $(TARGET_SAMPLES)/smacker/wetlogo.smk -pix_fmt rgb24 -an
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, SMC) += fate-smc
 +FATE_VIDEO-$(call DEMDEC, MOV, SMC) += fate-smc
  fate-smc: CMD = framecrc -i $(TARGET_SAMPLES)/smc/cass_schi.qt -pix_fmt rgb24
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, SP5X) += fate-sp5x
 +FATE_VIDEO-$(call DEMDEC, AVI, SP5X) += fate-sp5x
  fate-sp5x: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/sp5x/sp5x_problem.avi
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, SRT, SRT) += fate-sub-srt
 -fate-sub-srt: CMD = md5 -i $(TARGET_SAMPLES)/sub/SubRip_capability_tester.srt -f ass
 -
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, THP, THP) += fate-thp
 +FATE_VIDEO-$(call DEMDEC, THP, THP) += fate-thp
  fate-thp: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/thp/pikmin2-opening1-partial.thp -an
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, TIERTEXSEQ, TIERTEXSEQVIDEO) += fate-tiertex-seq
 +FATE_VIDEO-$(call DEMDEC, TIERTEXSEQ, TIERTEXSEQVIDEO) += fate-tiertex-seq
  fate-tiertex-seq: CMD = framecrc -i $(TARGET_SAMPLES)/tiertex-seq/Gameover.seq -pix_fmt rgb24
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, TMV, TMV) += fate-tmv
 +FATE_VIDEO-$(call DEMDEC, TMV, TMV) += fate-tmv
  fate-tmv: CMD = framecrc -i $(TARGET_SAMPLES)/tmv/pop-partial.tmv -pix_fmt rgb24
  
  FATE_TXD += fate-txd-16bpp