[FFmpeg-cvslog] Merge commit 'dc3fe45fca9c10c4af6bfcf48eb7b81968892ef9'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Thu Mar 23 11:40:09 2017 +0100| [dffa4ec1ed20a47a0d10f30d288ff82cd19a227e] | committer: Clément Bœsch

Merge commit 'dc3fe45fca9c10c4af6bfcf48eb7b81968892ef9'

* commit 'dc3fe45fca9c10c4af6bfcf48eb7b81968892ef9':
  fate: Add test for rscc palette

Merged-by: Clément Bœsch <u at pkh.me>

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

 tests/fate/screen.mak    | 3 +++
 tests/ref/fate/rscc-8bit | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/tests/fate/screen.mak b/tests/fate/screen.mak
index eb70ea2..66dfa6b 100644
--- a/tests/fate/screen.mak
+++ b/tests/fate/screen.mak
@@ -44,6 +44,9 @@ fate-g2m: $(FATE_G2M)
 FATE_RSCC += fate-iscc
 fate-iscc: CMD = framecrc -i $(TARGET_SAMPLES)/rscc/pip.avi -an
 
+FATE_RSCC += fate-rscc-8bit
+fate-rscc-8bit: CMD = framecrc -i $(TARGET_SAMPLES)/rscc/8bpp.avi -an -pix_fmt rgb24
+
 FATE_RSCC += fate-rscc-16bit
 fate-rscc-16bit: CMD = framecrc -i $(TARGET_SAMPLES)/rscc/16bpp_555.avi -an
 
diff --git a/tests/ref/fate/rscc-8bit b/tests/ref/fate/rscc-8bit
new file mode 100644
index 0000000..8a9ffe3
--- /dev/null
+++ b/tests/ref/fate/rscc-8bit
@@ -0,0 +1,6 @@
+#tb 0: 100/2997
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 854x480
+#sar 0: 0/1
+0,          0,          0,        1,  1229760, 0xfdf2e538


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

diff --cc tests/ref/fate/rscc-8bit
index 0000000,b6371ac..8a9ffe3
mode 000000,100644..100644
--- a/tests/ref/fate/rscc-8bit
+++ b/tests/ref/fate/rscc-8bit
@@@ -1,0 -1,2 +1,6 @@@
+ #tb 0: 100/2997
++#media_type 0: video
++#codec_id 0: rawvideo
++#dimensions 0: 854x480
++#sar 0: 0/1
+ 0,          0,          0,        1,  1229760, 0xfdf2e538