virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

lavu/parseutils: add digital cinema frame sizes

Browse Source 
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
This commit is contained in:
Dave Rice 2013-02-03 22:57:04 +01:00 committed by Stefano Sabatini
parent d106679fb5
commit 71956371a7
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/syntax.texi
View 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}

6
libavutil/parseutils.c
View 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[]= {

2
libavutil/version.h
View 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, \