avformat/mov: check avio_read() return in mov_read_dref()

[ffmpeg] / doc / ffserver.conf

diff --git a/doc/ffserver.conf b/doc/ffserver.conf
index 0f5922cc3e125af1d7e2ea447f8464fbc7b373e1..094c093af25a5abe7bcee66936c4632a65273cf9 100644 (file)
--- a/doc/ffserver.conf
+++ b/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>