Merge commit '219b39a7'

* commit '219b39a7':
  parseutil: Use non ambiguous aliases for uhd

Conflicts:
	doc/ffmpeg.texi
	libavutil/parseutils.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

doc/utils.texi

@@ -242,9 +242,9 @@ The following abbreviations are recognized:
 2048x1080
 @item 4kdci
 4096x2160
-@item uhd1
+@item uhd2160
 3840x2160
-@item uhd2
+@item uhd4320
 7680x4320
 @end table
 

libavutil/parseutils.c

@@ -124,8 +124,8 @@ static const VideoSizeAbbr video_size_abbrs[] = {
     { "fwqvga",    432,240  },
     { "hvga",      480,320  },
     { "qhd",       960,540  },
-    { "uhd1",     3840,2160 },
-    { "uhd2",     7680,4320 },
+    { "uhd2160",  3840,2160 },
+    { "uhd4320",  7680,4320 },
 };
 
 static const VideoRateAbbr video_rate_abbrs[]= {