summaryrefslogtreecommitdiffstats
path: root/chromium/third_party/ffmpeg/doc/ffserver.conf
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/ffmpeg/doc/ffserver.conf')
-rw-r--r--chromium/third_party/ffmpeg/doc/ffserver.conf10
1 files changed, 5 insertions, 5 deletions
diff --git a/chromium/third_party/ffmpeg/doc/ffserver.conf b/chromium/third_party/ffmpeg/doc/ffserver.conf
index 0f5922cc3e1..094c093af25 100644
--- a/chromium/third_party/ffmpeg/doc/ffserver.conf
+++ b/chromium/third_party/ffmpeg/doc/ffserver.conf
@@ -235,7 +235,7 @@ StartSendOnKey
#<Stream test.ogg>
#Feed feed1.ffm
-#Title "Stream title"
+#Metadata title "Stream title"
#AudioBitRate 64
#AudioChannels 2
#AudioSampleRate 44100
@@ -280,10 +280,10 @@ StartSendOnKey
#<Stream file.asf>
#File "/usr/local/httpd/htdocs/test.asf"
#NoAudio
-#Author "Me"
-#Copyright "Super MegaCorp"
-#Title "Test stream from disk"
-#Comment "Test comment"
+#Metadata author "Me"
+#Metadata copyright "Super MegaCorp"
+#Metadata title "Test stream from disk"
+#Metadata comment "Test comment"
#</Stream>