Merge commit '219b39a71a5694b1c14a07b86477f665a5b6849b'

* commit '219b39a71a5694b1c14a07b86477f665a5b6849b': parseutil: Use non ambiguous aliases for uhd Conflicts: doc/ffmpeg.texi libavutil/parseutils.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago · be0fd07457
parent 593731efa8 219b39a71a
commit be0fd07457
2 changed files with 4 additions and 4 deletions
--- a/doc/utils.texi
+++ b/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
--- a/libavutil/parseutils.c
+++ b/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 },
+    { "uhd2160",  3840,2160 },
-    { "uhd2",     7680,4320 },
+    { "uhd4320",  7680,4320 },
 };
 static const VideoRateAbbr video_rate_abbrs[]= {