Module: libav Branch: master Commit: 219b39a71a5694b1c14a07b86477f665a5b6849b
Author: Luca Barbato <[email protected]> Committer: Luca Barbato <[email protected]> Date: Mon Jul 20 16:50:43 2015 +0200 parseutil: Use non ambiguous aliases for uhd uhd1 and uhd2 would be ambigous. --- doc/avconv.texi | 4 ++-- libavutil/parseutils.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/avconv.texi b/doc/avconv.texi index 43215a0..504b8ed 100644 --- a/doc/avconv.texi +++ b/doc/avconv.texi @@ -497,9 +497,9 @@ abbreviations are recognized: 2048x1080 @item 4kdci 4096x2160 -@item uhd1 +@item uhd2160 3840x2160 -@item uhd2 +@item uhd4320 7680x4320 @end table diff --git a/libavutil/parseutils.c b/libavutil/parseutils.c index d205fc4..39238f2 100644 --- a/libavutil/parseutils.c +++ b/libavutil/parseutils.c @@ -82,8 +82,8 @@ static const VideoSizeAbbr video_size_abbrs[] = { { "hd1080", 1920,1080 }, { "2kdci", 2048,1080 }, { "4kdci", 4096,2160 }, - { "uhd1", 3840,2160 }, - { "uhd2", 7680,4320 }, + { "uhd2160", 3840,2160 }, + { "uhd4320", 7680,4320 }, }; static const VideoRateAbbr video_rate_abbrs[]= { _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
