Merge commit 'd60c2d5216930ef98c7d4d6837d6229b37e0dcb3'

[ffmpeg] / doc / ffserver.conf

diff --git a/doc/ffserver.conf b/doc/ffserver.conf
index 7a30fb6c3bfba5e0c2a8a429ae2661d789ef4fba..e3f99bbfb3d728c4e225e26e007d2045eaa81cc4 100644 (file)
--- a/doc/ffserver.conf
+++ b/doc/ffserver.conf
@@ -317,7 +317,7 @@ StartSendOnKey
 #AVPresetVideo baseline
 #AVOptionVideo flags +global_header
 #
-#AudioCodec libfaac
+#AudioCodec aac
 #AudioBitRate 32
 #AudioChannels 2
 #AudioSampleRate 22050