From e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2 Mon Sep 17 00:00:00 2001
From: Luca Barbato <lu_zero@gentoo.org>
Date: Fri, 17 Jul 2015 00:31:54 +0200
Subject: [PATCH] parseutil: Add more resolution aliases

Add DCI 2k and 4k and uhd1 and uhd2.
---
 doc/avconv.texi        | 8 ++++++++
 libavutil/parseutils.c | 4 ++++
 2 files changed, 12 insertions(+)

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[]= {