summaryrefslogtreecommitdiff
path: root/doc/ffserver.conf
diff options
context:
space:
mode:
authorBenoit Fouet <benoit.fouet@free.fr>2007-04-24 11:45:13 +0000
committerBenoit Fouet <benoit.fouet@free.fr>2007-04-24 11:45:13 +0000
commit7d88b5ca0224dc898ba95beec1314849780f10bd (patch)
treebf64fa2f9018e3868e00fa441aafe3d72ebb1bdc /doc/ffserver.conf
parent2f8fe719c6a0287b1e892002c2e1b726ab10a581 (diff)
downloadffmpeg-7d88b5ca0224dc898ba95beec1314849780f10bd.tar.gz
more format abbreviations
Originally committed as revision 8798 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc/ffserver.conf')
-rw-r--r--doc/ffserver.conf5
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/ffserver.conf b/doc/ffserver.conf
index a3b3ff4129..f7db66ed26 100644
--- a/doc/ffserver.conf
+++ b/doc/ffserver.conf
@@ -109,7 +109,10 @@ VideoBufferSize 40
VideoFrameRate 3
# Size of the video frame: WxH (default: 160x128)
-# The following abbreviations are defined: sqcif, qcif, cif, 4cif
+# The following abbreviations are defined: sqcif, qcif, cif, 4cif, qqvga,
+# qvga, vga, svga, xga, uxga, qxga, sxga, qsxga, hsxga, wvga, wxga, wsxga,
+# wuxga, woxga, wqsxga, wquxga, whsxga, whuxga, cga, ega, hd480, hd720,
+# hd1080
VideoSize 160x128
# Transmit only intra frames (useful for low bitrates, but kills frame rate).