diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2012-09-24 01:27:36 +0200 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2012-09-24 10:04:44 +0200 |
| commit | 10c00f7a04872edc5d6f520562c0999d643a5255 (patch) | |
| tree | 643a5275c90a7d86cc45252f2d18cd3329d538d4 | |
| parent | 64d340c62ad5954c1a834df2d26057135e771774 (diff) | |
| download | ffmpeg-10c00f7a04872edc5d6f520562c0999d643a5255.tar.gz | |
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.
| -rw-r--r-- | tests/Makefile | 6 | ||||
| -rw-r--r-- | tests/test.ffmeta | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/tests/Makefile b/tests/Makefile index 5f9be8a8af..f2c56b3f22 100644 --- 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 index 0000000000..18a260d350 --- /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€ |