more format abbreviations

Originally committed as revision 8798 to svn://svn.ffmpeg.org/ffmpeg/trunk

2 files changed, 52 insertions, 1 deletions

diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index 64d063141b..101fae1635 100644
--- a/doc/ffmpeg-doc.texi
+++ b/doc/ffmpeg-doc.texi
@@ -308,6 +308,54 @@ The following abbreviations are recognized:
 352x288
 @item 4cif
 704x576
+@item qqvga
+160x120
+@item qvga
+320x240
+@item vga
+640x480
+@item svga
+800x600
+@item xga
+1024x768
+@item uxga
+1600x1200
+@item qxga
+2048x1536
+@item sxga
+1280x1024
+@item qsxga
+2560x2048
+@item hsxga
+5120x4096
+@item wvga
+852x480
+@item wxga
+1366x768
+@item wsxga
+1600x1024
+@item wuxga
+1920x1200
+@item woxga
+2560x1600
+@item wqsxga
+3200x2048
+@item wquxga
+3840x2400
+@item whsxga
+6400x4096
+@item whuxga
+7680x4800
+@item cga
+320x200
+@item ega
+640x350
+@item hd480
+852x480
+@item hd720
+1280x720
+@item hd1080
+1920x1080
 @end table
 
 @item -aspect aspect
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).