[FFmpeg-cvslog] lavu/parseutils: add digital cinema frame sizes
Dave Rice
git at videolan.org
Sun Feb 3 23:02:50 CET 2013
ffmpeg | branch: master | Dave Rice <dave at dericed.com> | Sun Feb 3 22:57:04 2013 +0100| [71956371a7bb911dee4b206cd991bbdca2e0fb62] | committer: Stefano Sabatini
lavu/parseutils: add digital cinema frame sizes
Signed-off-by: Stefano Sabatini <stefasab at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=71956371a7bb911dee4b206cd991bbdca2e0fb62
---
doc/syntax.texi | 12 ++++++++++++
libavutil/parseutils.c | 6 ++++++
libavutil/version.h | 2 +-
3 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/doc/syntax.texi b/doc/syntax.texi
index 9d3afa3..4dddc3c 100644
--- a/doc/syntax.texi
+++ b/doc/syntax.texi
@@ -186,6 +186,18 @@ The following abbreviations are recognized:
1280x720
@item hd1080
1920x1080
+ at item 2k
+2048x1080
+ at item 2kflat
+1998x1080
+ at item 2kscope
+2048x858
+ at item 4k
+4096x2160
+ at item 4kflat
+3996x2160
+ at item 4kscope
+4096x1716
@end table
@anchor{video rate syntax}
diff --git a/libavutil/parseutils.c b/libavutil/parseutils.c
index ca40569..73e400a 100644
--- a/libavutil/parseutils.c
+++ b/libavutil/parseutils.c
@@ -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[]= {
diff --git a/libavutil/version.h b/libavutil/version.h
index 2b574f5..3d53261 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -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, \
More information about the ffmpeg-cvslog
mailing list