Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / ffmpeg / tests / ffserver.conf

diff --git a/src/third_party/ffmpeg/tests/ffserver.conf b/src/third_party/ffmpeg/tests/ffserver.conf
index 1e6994a..ae35d7f 100644 (file)
--- a/src/third_party/ffmpeg/tests/ffserver.conf
+++ b/src/third_party/ffmpeg/tests/ffserver.conf
@@ -11,13 +11,13 @@
 # port from your standard http web server if it is running on the same
 # computer.
 
-Port 9999
+HTTPPort 9999
 RTSPPort 9990
 
 # Address on which the server is bound. Only useful if you have
 # several network interfaces.
 
-BindAddress 0.0.0.0
+HTTPBindAddress 0.0.0.0
 
 # Number of simultaneous requests that can be handled. Since FFServer
 # is very fast, this limit is determined mainly by your Internet
@@ -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>
@@ -173,7 +173,9 @@ PreRoll 10
 StartSendOnKey
 MaxTime 100
 
-Title "Test data stream"
+AVOptionVideo flags +global_header
+
+Metadata title "Test data stream"
 
 </Stream>
 
@@ -195,7 +197,9 @@ PreRoll 20
 StartSendOnKey
 MaxTime 100
 
-Title "Test data stream"
+AVOptionVideo flags +global_header
+
+Metadata title "Test data stream"
 
 </Stream>