Merge remote-tracking branch 'qatar/master'

[ffmpeg] / doc / ffserver.texi

diff --git a/doc/ffserver.texi b/doc/ffserver.texi
index c93852632d16fb772c7dd17d5102092bf87e90e3..3f7a98dbe56ab792483b93e90cd74df675ae1bb4 100644 (file)
--- a/doc/ffserver.texi
+++ b/doc/ffserver.texi
@@ -753,7 +753,7 @@ NoVideo
 @end example
 
 @item
-Ogg Vorbis audio:
+Ogg Vorbis audio
 @example
 <Stream test.ogg>
 Feed feed1.ffm
@@ -773,7 +773,6 @@ Feed feed1.ffm
 Format rm
 AudioBitRate 32
 NoVideo
-NoAudio
 </Stream>
 @end example
 
@@ -787,7 +786,6 @@ AudioBitRate 32
 VideoBitRate 128
 VideoFrameRate 25
 VideoGopSize 25
-NoAudio
 </Stream>
 @end example