[FFmpeg-cvslog] Merge commit '770cf1dbc2c8fe9b84300439ad0cd85036480388'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Fri Nov 10 20:36:39 2017 -0300| [ec54df7dcd5935cc5efa6a25293b255a5d9a67f5] | committer: James Almer

Merge commit '770cf1dbc2c8fe9b84300439ad0cd85036480388'

* commit '770cf1dbc2c8fe9b84300439ad0cd85036480388':
  fate/hevc: specify output pixel format explicitly

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ec54df7dcd5935cc5efa6a25293b255a5d9a67f5
---

 tests/fate/hevc.mak | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/fate/hevc.mak b/tests/fate/hevc.mak
index 2e798eca60..5a3c156ee6 100644
--- a/tests/fate/hevc.mak
+++ b/tests/fate/hevc.mak
@@ -187,7 +187,7 @@ HEVC_SAMPLES_444_12BIT =        \
 
 define FATE_HEVC_TEST
 FATE_HEVC += fate-hevc-conformance-$(1)
-fate-hevc-conformance-$(1): CMD = framecrc -flags unaligned -vsync drop -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit
+fate-hevc-conformance-$(1): CMD = framecrc -flags unaligned -vsync drop -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit -pix_fmt yuv420p
 endef
 
 define FATE_HEVC_TEST_10BIT
@@ -207,7 +207,7 @@ endef
 
 define FATE_HEVC_TEST_444_8BIT
 FATE_HEVC += fate-hevc-conformance-$(1)
-fate-hevc-conformance-$(1): CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit
+fate-hevc-conformance-$(1): CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit -pix_fmt yuv444p
 endef
 
 define FATE_HEVC_TEST_444_12BIT


======================================================================

diff --cc tests/fate/hevc.mak
index 2e798eca60,fe3ef26c77..5a3c156ee6
--- a/tests/fate/hevc.mak
+++ b/tests/fate/hevc.mak
@@@ -187,32 -144,12 +187,32 @@@ HEVC_SAMPLES_444_12BIT =        
  
  define FATE_HEVC_TEST
  FATE_HEVC += fate-hevc-conformance-$(1)
- fate-hevc-conformance-$(1): CMD = framecrc -flags unaligned -vsync drop -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit
 -fate-hevc-conformance-$(1): CMD = framecrc -vsync 0 -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit -pix_fmt yuv420p
++fate-hevc-conformance-$(1): CMD = framecrc -flags unaligned -vsync drop -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit -pix_fmt yuv420p
  endef
  
  define FATE_HEVC_TEST_10BIT
  FATE_HEVC += fate-hevc-conformance-$(1)
 -fate-hevc-conformance-$(1): CMD = framecrc -vsync 0 -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit -pix_fmt yuv420p10le
 +fate-hevc-conformance-$(1): CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit -pix_fmt yuv420p10le
 +endef
 +
 +define FATE_HEVC_TEST_422_10BIT
 +FATE_HEVC += fate-hevc-conformance-$(1)
 +fate-hevc-conformance-$(1): CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit -pix_fmt yuv422p10le
 +endef
 +
 +define FATE_HEVC_TEST_422_10BIN
 +FATE_HEVC += fate-hevc-conformance-$(1)
 +fate-hevc-conformance-$(1): CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bin -pix_fmt yuv422p10le
 +endef
 +
 +define FATE_HEVC_TEST_444_8BIT
 +FATE_HEVC += fate-hevc-conformance-$(1)
- fate-hevc-conformance-$(1): CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit
++fate-hevc-conformance-$(1): CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit -pix_fmt yuv444p
 +endef
 +
 +define FATE_HEVC_TEST_444_12BIT
 +FATE_HEVC += fate-hevc-conformance-$(1)
 +fate-hevc-conformance-$(1): CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit -pix_fmt yuv444p12le
  endef
  
  $(foreach N,$(HEVC_SAMPLES),$(eval $(call FATE_HEVC_TEST,$(N))))