summaryrefslogtreecommitdiff
path: root/doc/ffmpeg.texi
diff options
context:
space:
mode:
authorStefano Sabatini <stefasab@gmail.com>2012-05-03 15:14:14 +0200
committerStefano Sabatini <stefasab@gmail.com>2012-05-22 00:39:53 +0200
commit27127ebe6cd5ced73717edc22275e50368677148 (patch)
tree9634240be2bb31c856ebe17959a8fa56f0b44685 /doc/ffmpeg.texi
parent938adb7abcfb38ab8287e97847010479a116f78c (diff)
doc: add syntax.texi file
Diffstat (limited to 'doc/ffmpeg.texi')
-rw-r--r--doc/ffmpeg.texi62
1 files changed, 1 insertions, 61 deletions
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index 5e2f33a4bb..44c2ad42ed 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -286,67 +286,6 @@ Set frame rate (Hz value, fraction or abbreviation), (default = 25). For output
streams implies @code{-vsync cfr}.
@item -s[:@var{stream_specifier}] @var{size} (@emph{input/output,per-stream})
Set frame size. The format is @samp{wxh} (default - same as source).
-The following abbreviations are recognized:
-@table @samp
-@item sqcif
-128x96
-@item qcif
-176x144
-@item cif
-352x288
-@item 4cif
-704x576
-@item 16cif
-1408x1152
-@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[:@var{stream_specifier}] @var{aspect} (@emph{output,per-stream})
Set the video display aspect ratio specified by @var{aspect}.
@@ -1179,6 +1118,7 @@ ffmpeg -i src.ext -lmax 21*QP2LAMBDA dst.ext
@end itemize
@c man end EXAMPLES
+@include syntax.texi
@include eval.texi
@include decoders.texi
@include encoders.texi