Merge remote-tracking branch 'qatar/master'

[ffmpeg] / doc / ffserver.texi

diff --git a/doc/ffserver.texi b/doc/ffserver.texi
index 664663796cbb34ce54fb3ce4684bb7dd61bb3401..3f7a98dbe56ab792483b93e90cd74df675ae1bb4 100644 (file)
--- a/doc/ffserver.texi
+++ b/doc/ffserver.texi
@@ -786,7 +786,6 @@ AudioBitRate 32
 VideoBitRate 128
 VideoFrameRate 25
 VideoGopSize 25
-NoAudio
 </Stream>
 @end example