Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2012-11-05 04:05:10 +0400
committerPaul B Mahol <onemda@gmail.com>2012-11-05 15:22:53 +0400
commit17e67c532100024e1fe8fef69b3d99c82f393b9a (patch)
treec0933bca795cbaafce05a5b4c606c6064790229e /tests
parenta8b3130181f6f7d3eb491e9589ee0a7c1a0c870a (diff)
fate: add smjpegenc test
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/fate/avformat.mak1
-rwxr-xr-xtests/lavf-regression.sh4
-rw-r--r--tests/ref/lavf/smjpeg3
3 files changed, 8 insertions, 0 deletions
diff --git a/tests/fate/avformat.mak b/tests/fate/avformat.mak
index 56d56fb26f..77c6a2ff16 100644
--- a/tests/fate/avformat.mak
+++ b/tests/fate/avformat.mak
@@ -33,6 +33,7 @@ FATE_LAVF-$(call ENCDEC, PPM, IMAGE2PIPE) += ppmpipe
FATE_LAVF-$(call ENCMUX, RV10 AC3_FIXED, RM) += rm
FATE_LAVF-$(call ENCDEC, PCM_U8, RSO) += rso
FATE_LAVF-$(call ENCDEC, SGI, IMAGE2) += sgi
+FATE_LAVF-$(call ENCMUX, MJPEG PCM_S16LE, SMJPEG) += smjpeg
FATE_LAVF-$(call ENCDEC, PCM_S16LE, SOX) += sox
FATE_LAVF-$(call ENCDEC, SUNRAST, IMAGE2) += sunrast
FATE_LAVF-$(call ENCDEC, FLV, SWF) += swf
diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh
index ef61b6c78f..281286d85e 100755
--- a/tests/lavf-regression.sh
+++ b/tests/lavf-regression.sh
@@ -302,6 +302,10 @@ if [ -n "$do_rso" ] ; then
do_audio_only rso
fi
+if [ -n "$do_smjpeg" ] ; then
+do_lavf smjpeg "" "-f smjpeg"
+fi
+
if [ -n "$do_sox" ] ; then
do_audio_only sox
fi
diff --git a/tests/ref/lavf/smjpeg b/tests/ref/lavf/smjpeg
new file mode 100644
index 0000000000..3e7e8edfa9
--- /dev/null
+++ b/tests/ref/lavf/smjpeg
@@ -0,0 +1,3 @@
+2f6e613e9e257545e1048d57de92ba92 *./tests/data/lavf/lavf.smjpeg
+791463 ./tests/data/lavf/lavf.smjpeg
+./tests/data/lavf/lavf.smjpeg CRC=0x557714ff