Merge commit '54974c62982ae827becdbdb9b620b7ba75d079a0'

[ffmpeg] / doc / syntax.texi

diff --git a/doc/syntax.texi b/doc/syntax.texi
index a3aabce1e909a6ed2be7c2c722906566fc25d35e..4dddc3cbc2b00d4749fabdd88c78f8a1e3272912 100644 (file)
--- a/doc/syntax.texi
+++ b/doc/syntax.texi
@@ -112,6 +112,22 @@ Specify the size of the sourced video, it may be a string of the form
 
 The following abbreviations are recognized:
 @table @samp
+@item ntsc
+720x480
+@item pal
+720x576
+@item qntsc
+352x240
+@item qpal
+352x288
+@item sntsc
+640x480
+@item spal
+768x576
+@item film
+352x240
+@item ntsc-film
+352x240
 @item sqcif
 128x96
 @item qcif
@@ -170,6 +186,18 @@ The following abbreviations are recognized:
 1280x720
 @item hd1080
 1920x1080
+@item 2k
+2048x1080
+@item 2kflat
+1998x1080
+@item 2kscope
+2048x858
+@item 4k
+4096x2160
+@item 4kflat
+3996x2160
+@item 4kscope
+4096x1716
 @end table
 
 @anchor{video rate syntax}
@@ -187,17 +215,17 @@ The following abbreviations are recognized:
 @item pal
 25/1
 @item qntsc
-30000/1
+30000/1001
 @item qpal
 25/1
 @item sntsc
-30000/1
+30000/1001
 @item spal
 25/1
 @item film
 24/1
 @item ntsc-film
-24000/1
+24000/1001
 @end table
 
 @anchor{ratio syntax}