lavu/parseutils: add digital cinema frame sizes
authorDave Rice <dave@dericed.com>
Sun, 3 Feb 2013 21:57:04 +0000 (22:57 +0100)
committerStefano Sabatini <stefasab@gmail.com>
Sun, 3 Feb 2013 21:57:04 +0000 (22:57 +0100)
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
doc/syntax.texi
libavutil/parseutils.c
libavutil/version.h

index 9d3afa3..4dddc3c 100644 (file)
@@ -186,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}
index ca40569..73e400a 100644 (file)
@@ -109,6 +109,12 @@ static const VideoSizeAbbr video_size_abbrs[] = {
     { "hd480",     852, 480 },
     { "hd720",    1280, 720 },
     { "hd1080",   1920,1080 },
+    { "2k",       2048,1080 }, /* Digital Cinema System Specification */
+    { "2kflat",   1998,1080 },
+    { "2kscope",  2048, 858 },
+    { "4k",       4096,2160 }, /* Digital Cinema System Specification */
+    { "4kflat",   3996,2160 },
+    { "4kscope",  4096,1716 },
 };
 
 static const VideoRateAbbr video_rate_abbrs[]= {
index 2b574f5..3d53261 100644 (file)
@@ -76,7 +76,7 @@
 
 #define LIBAVUTIL_VERSION_MAJOR  52
 #define LIBAVUTIL_VERSION_MINOR  17
-#define LIBAVUTIL_VERSION_MICRO 100
+#define LIBAVUTIL_VERSION_MICRO 101
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
                                                LIBAVUTIL_VERSION_MINOR, \