aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorReynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>2014-08-25 12:24:02 -0400
committerReynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>2014-08-31 18:18:40 -0400
commitb627385b4bd26bb45da5999fb12a8171fc224115 (patch)
tree57c98385331767b62d30470bbe6485559c47b9d3 /tests
parent935453102bb5ccf868369f25049e0c3ae900f6bc (diff)
downloadffmpeg-b627385b4bd26bb45da5999fb12a8171fc224115.tar.gz
ffserver: tests, use image2 instead of pgmyuv
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/ffserver.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/ffserver.conf b/tests/ffserver.conf
index 3612843fae..1e7a685b93 100644
--- a/tests/ffserver.conf
+++ b/tests/ffserver.conf
@@ -57,7 +57,7 @@ FileMaxSize 100M
# Fire up ffmpeg pointing at this stream
-Launch ./ffmpeg -v 0 -y -f pgmyuv -i tests/vsynth1/%02d.pgm
+Launch ./ffmpeg -v 0 -y -f image2 -i tests/vsynth1/%02d.pgm
ACL allow localhost
</Feed>