tests/fate-ffprobe: use an ffmetadata file for the injected metadata

Workaround commandline msys issues, also allow more flexibility.
Should fix ffprobe tests on mingw+MSVC.

diff --git a/tests/Makefile b/tests/Makefile
index 5f9be8a8af23fb9827f21f8d603a328383c7520b..f2c56b3f2248eab342f71443395325da042a77e6 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -33,10 +33,8 @@ tests/data/vsynth2.yuv: tests/rotozoom$(HOSTEXESUF) | tests/data
 tests/data/ffprobe-test.nut: ffmpeg$(HOSTEXESUF) | tests/data
        $(M)./$< \
         -f lavfi -i "aevalsrc=sin(400*PI*2*t)::d=0.125[out0]; testsrc=d=0.125[out1]; testsrc=s=100x100:d=0.125[out2]" \
-        -flags +bitexact -map 0:0 -map 0:1 -map 0:2 \
-        -metadata "title=ffprobe test file" \
-        -metadata "comment='A comment wih CSV, XML & JSON special chars': <tag value=\"x\">" \
-        -metadata "comment2=I ♥ Üñîçød€" \
+        -f ffmetadata -i $(SRC_PATH)/tests/test.ffmeta \
+        -flags +bitexact -map 0:0 -map 0:1 -map 0:2 -map_metadata 1 \
         -vcodec rawvideo -acodec pcm_s16le \
         -y $@ 2>/dev/null
 

diff --git a/tests/test.ffmeta b/tests/test.ffmeta
new file mode 100644 (file)
index 0000000..18a260d
--- /dev/null
+++ b/tests/test.ffmeta
@@ -0,0 +1,4 @@
+;FFMETADATA1
+title=ffprobe test file
+comment='A comment wih CSV, XML & JSON special chars': <tag value=\"x\">
+comment2=I ♥ Üñîçød€