Permalink
Browse files

lavu/parseutils: add digital cinema frame sizes

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
  • Loading branch information...
dericed authored and saste committed Feb 3, 2013
1 parent d106679 commit 71956371a7bb911dee4b206cd991bbdca2e0fb62
Showing with 19 additions and 1 deletion.
  1. +12 −0 doc/syntax.texi
  2. +6 −0 libavutil/parseutils.c
  3. +1 −1 libavutil/version.h
View
@@ -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}
View
@@ -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[]= {
View
@@ -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, \

0 comments on commit 7195637

Please sign in to comment.