diff options
| author | Diego Biurrun <diego@biurrun.de> | 2005-06-11 15:56:19 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2005-06-11 15:56:19 +0000 |
| commit | f5f30f1bce57d1155c6e7d0a3d753900377dcd25 (patch) | |
| tree | b0fea0e07513934b916ca3431b2f21a5bf845ce5 /doc/ffserver.conf | |
| parent | a2632fd268b383936b86940346fc42e35d960bbd (diff) | |
| download | ffmpeg-f5f30f1bce57d1155c6e7d0a3d753900377dcd25.tar.gz | |
Talk of MPEG-4 instead of DivX.
Originally committed as revision 4373 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc/ffserver.conf')
| -rw-r--r-- | doc/ffserver.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/ffserver.conf b/doc/ffserver.conf index c6720908f8..62f169f9d1 100644 --- 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 |