Skip to content

Instantly share code, notes, and snippets.

@rcombs

rcombs/stdin Secret

Created October 26, 2015 22:56
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save rcombs/fbdf6b31bcc6a02bc9a9 to your computer and use it in GitHub Desktop.
Save rcombs/fbdf6b31bcc6a02bc9a9 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
stdin
diff --git a/tests/Makefile b/tests/Makefile
index 7ee4a46..c501813 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -82,6 +82,11 @@ ENCDEC2 = $(call ALLYES, $(firstword $(1))_ENCODER $(lastword $(1))_DECODER \
$(firstword $(2))_ENCODER $(lastword $(2))_DECODER \
$(firstword $(3))_MUXER $(lastword $(3))_DEMUXER)
+ENCDEC2PRO = $(call ALLYES, $(firstword $(1))_ENCODER $(lastword $(1))_DECODER \
+ $(firstword $(2))_ENCODER $(lastword $(2))_DECODER \
+ $(firstword $(3))_MUXER $(lastword $(3))_DEMUXER \
+ $(firstword $(4))_PROTOCOL)
+
DEMDEC = $(call ALLYES, $(1)_DEMUXER $(2:%=%_DECODER))
ENCMUX = $(call ALLYES, $(1:%=%_ENCODER) $(2)_MUXER)
diff --git a/tests/fate/avformat.mak b/tests/fate/avformat.mak
index 21b8f8a..e65c3f9 100644
--- a/tests/fate/avformat.mak
+++ b/tests/fate/avformat.mak
@@ -6,6 +6,7 @@ FATE_LAVF-$(call ENCDEC, PCM_S16BE, AU) += au
FATE_LAVF-$(call ENCDEC2, MPEG4, MP2, AVI) += avi
FATE_LAVF-$(call ENCDEC, BMP, IMAGE2) += bmp
FATE_LAVF-$(call ENCDEC, PCM_S16BE, CAF) += caf
+FATE_LAVF-$(call ENCDEC2PRO, MPEG4, MP2, NUT, CRYPTO) += crypto
FATE_LAVF-$(call ENCDEC, DPX, IMAGE2) += dpx
FATE_LAVF-$(call ENCDEC2, DVVIDEO, PCM_S16LE, AVI) += dv_fmt
FATE_LAVF-$(call ENCDEC2, MPEG1VIDEO, MP2, FFM) += ffm
@@ -68,7 +69,6 @@ fate-lavf: $(FATE_LAVF)
FATE_LAVF_FATE-$(call ALLYES, MATROSKA_DEMUXER OGG_MUXER) += ogg_vp3
FATE_LAVF_FATE-$(call ALLYES, MOV_DEMUXER LATM_MUXER) += latm
FATE_LAVF_FATE-$(call ALLYES, MP3_DEMUXER MP3_MUXER) += mp3
-FATE_LAVF_FATE-$(call ALLYES, NUT_MUXER CRYPTO_PROTOCOL) += crypto
FATE_LAVF_FATE += $(FATE_LAVF_FATE-yes:%=fate-lavf-fate-%)
$(FATE_LAVF_FATE): CMD = lavffatetest
diff --git a/tests/ref/lavf/crypto b/tests/ref/lavf/crypto
index ab682c9..d1dfd66 100644
--- a/tests/ref/lavf/crypto
+++ b/tests/ref/lavf/crypto
@@ -1,3 +1,3 @@
-a12b1a78ebc04786a694394a4d6d6c41 *./tests/data/lavf-fate/lavf.crypto.nut
-319968 ./tests/data/lavf-fate/lavf.crypto.nut
+a12b1a78ebc04786a694394a4d6d6c41 *./tests/data/lavf/lavf.crypto.nut
+319968 ./tests/data/lavf/lavf.crypto.nut
crypto CRC=0xec6c3c68
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment