summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2009-03-29 20:17:23 +0000
committerDiego Biurrun <diego@biurrun.de>2009-03-29 20:17:23 +0000
commit688a47736760d57a79a7fd4289f2de020f938a5c (patch)
tree2bd4f4e18573199fb664b91129d165ce2892c012 /Makefile
parentaadf88119e5c4fe1cb41946ab7dd700912903010 (diff)
Rename test.conf --> ffserver.conf, the new name is more meaningful.
Originally committed as revision 18226 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 2a48a59234..1aace00436 100644
--- a/Makefile
+++ b/Makefile
@@ -282,7 +282,7 @@ servertest: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/asynth1.sw
@echo "Unfortunately ffserver is broken and therefore its regression"
@echo "test fails randomly. Treat the results accordingly."
@echo
- $(SRC_PATH)/tests/server-regression.sh $(FFSERVER_REFFILE) $(SRC_PATH)/tests/test.conf
+ $(SRC_PATH)/tests/server-regression.sh $(FFSERVER_REFFILE) $(SRC_PATH)/tests/ffserver.conf
tests/vsynth1/00.pgm: tests/videogen$(HOSTEXESUF)
mkdir -p tests/vsynth1