aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGwenole Beauchesne <gbeauchesne@splitted-desktop.com>2009-04-01 08:55:31 +0000
committerGwenole Beauchesne <gbeauchesne@splitted-desktop.com>2009-04-01 08:55:31 +0000
commit41913a35b0fe2f9966cf8dfa2718180fb2febe53 (patch)
treec8f5794ab4bc7621bf0d610162af68be2b9b765f
parent828775e16046c3d5626ba1d8856101ee3c34a3e3 (diff)
downloadffmpeg-41913a35b0fe2f9966cf8dfa2718180fb2febe53.tar.gz
Add 16cif video frame size abbreviation. i.e. -s alias for 1408x1152.
Originally committed as revision 18301 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--doc/ffmpeg-doc.texi2
-rw-r--r--libavcodec/utils.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index b1114507b1..968fee3998 100644
--- a/doc/ffmpeg-doc.texi
+++ b/doc/ffmpeg-doc.texi
@@ -360,6 +360,8 @@ The following abbreviations are recognized:
352x288
@item 4cif
704x576
+@item 16cif
+1408x1152
@item qqvga
160x120
@item qvga
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 50ca4cad29..4113382997 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1009,6 +1009,7 @@ static const VideoFrameSizeAbbr video_frame_size_abbrs[] = {
{ "qcif", 176, 144 },
{ "cif", 352, 288 },
{ "4cif", 704, 576 },
+ { "16cif", 1408,1152 },
{ "qqvga", 160, 120 },
{ "qvga", 320, 240 },
{ "vga", 640, 480 },