diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-20 04:32:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-20 04:32:28 +0200 |
| commit | 9ebe041e1ca898ed725051460961f1fda5f7a20b (patch) | |
| tree | 716df11c495620ee39366c329b9f4b8d068ce3ce /libavutil | |
| parent | cb53db144c104f447782b8918e94704484aedc8b (diff) | |
| parent | e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2 (diff) | |
| download | ffmpeg-9ebe041e1ca898ed725051460961f1fda5f7a20b.tar.gz | |
Merge commit 'e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2'
* commit 'e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2':
parseutil: Add more resolution aliases
Conflicts:
doc/ffmpeg.texi
libavutil/parseutils.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/parseutils.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavutil/parseutils.c b/libavutil/parseutils.c index 98858394ea..90135bcfb6 100644 --- a/libavutil/parseutils.c +++ b/libavutil/parseutils.c @@ -111,9 +111,11 @@ static const VideoSizeAbbr video_size_abbrs[] = { { "hd720", 1280, 720 }, { "hd1080", 1920,1080 }, { "2k", 2048,1080 }, /* Digital Cinema System Specification */ + { "2kdci", 2048,1080 }, { "2kflat", 1998,1080 }, { "2kscope", 2048, 858 }, { "4k", 4096,2160 }, /* Digital Cinema System Specification */ + { "4kdci", 4096,2160 }, { "4kflat", 3996,2160 }, { "4kscope", 4096,1716 }, { "nhd", 640,360 }, @@ -122,6 +124,8 @@ static const VideoSizeAbbr video_size_abbrs[] = { { "fwqvga", 432,240 }, { "hvga", 480,320 }, { "qhd", 960,540 }, + { "uhd1", 3840,2160 }, + { "uhd2", 7680,4320 }, }; static const VideoRateAbbr video_rate_abbrs[]= { |