git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a2632fd
)
Talk of MPEG-4 instead of DivX.
author
Diego Biurrun
<diego@biurrun.de>
Sat, 11 Jun 2005 15:56:19 +0000
(15:56 +0000)
committer
Diego Biurrun
<diego@biurrun.de>
Sat, 11 Jun 2005 15:56:19 +0000
(15:56 +0000)
Originally committed as revision 4373 to svn://svn.ffmpeg.org/ffmpeg/trunk
doc/ffserver.conf
patch
|
blob
|
history
diff --git
a/doc/ffserver.conf
b/doc/ffserver.conf
index
c672090
..
62f169f
100644
(file)
--- a/
doc/ffserver.conf
+++ b/
doc/ffserver.conf
@@
-81,7
+81,7
@@
Feed feed1.ffm
# jpeg : Generate a single JPEG image.
# asf : ASF compatible streaming (Windows Media Player format).
# swf : Macromedia Flash compatible stream
-# avi : AVI format (
OpenDivX
video, MPEG audio sound)
+# avi : AVI format (
MPEG-4
video, MPEG audio sound)
# master : special ffmpeg stream used to duplicate a server
Format mpeg