diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2015-07-17 00:31:54 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2015-07-20 04:05:48 +0200 |
| commit | e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2 (patch) | |
| tree | cff1e4c3b79db245e5a7d8ff192f449a321fcd1d | |
| parent | 69b92f1b99f3f210be19ee6ec06f6c0de1733031 (diff) | |
| download | ffmpeg-e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2.tar.gz | |
parseutil: Add more resolution aliases
Add DCI 2k and 4k and uhd1 and uhd2.
| -rw-r--r-- | doc/avconv.texi | 8 | ||||
| -rw-r--r-- | libavutil/parseutils.c | 4 |
2 files changed, 12 insertions, 0 deletions
diff --git a/doc/avconv.texi b/doc/avconv.texi index aea41d9eec..43215a08e5 100644 --- a/doc/avconv.texi +++ b/doc/avconv.texi @@ -493,6 +493,14 @@ abbreviations are recognized: 1280x720 @item hd1080 1920x1080 +@item 2kdci +2048x1080 +@item 4kdci +4096x2160 +@item uhd1 +3840x2160 +@item uhd2 +7680x4320 @end table @item -aspect[:@var{stream_specifier}] @var{aspect} (@emph{output,per-stream}) diff --git a/libavutil/parseutils.c b/libavutil/parseutils.c index be238f0dde..d205fc401c 100644 --- a/libavutil/parseutils.c +++ b/libavutil/parseutils.c @@ -80,6 +80,10 @@ static const VideoSizeAbbr video_size_abbrs[] = { { "hd480", 852, 480 }, { "hd720", 1280, 720 }, { "hd1080", 1920,1080 }, + { "2kdci", 2048,1080 }, + { "4kdci", 4096,2160 }, + { "uhd1", 3840,2160 }, + { "uhd2", 7680,4320 }, }; static const VideoRateAbbr video_rate_abbrs[]= { |