highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

parseutil: Use non ambiguous aliases for uhd

Browse Source 
uhd1 and uhd2 would be ambigous.
This commit is contained in:
Luca Barbato 2015-07-20 16:50:43 +02:00
parent 9ed6f9a17c
commit 219b39a71a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/avconv.texi
View File

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

4
libavutil/parseutils.c
View File

@ -82,8 +82,8 @@ static const VideoSizeAbbr video_size_abbrs[] = {
{ "hd1080", 1920,1080 }, { "hd1080", 1920,1080 },
{ "2kdci", 2048,1080 }, { "2kdci", 2048,1080 },
{ "4kdci", 4096,2160 }, { "4kdci", 4096,2160 },
{ "uhd1", 3840,2160 }, { "uhd2160", 3840,2160 },
{ "uhd2", 7680,4320 }, { "uhd4320", 7680,4320 },
}; };
static const VideoRateAbbr video_rate_abbrs[]= { static const VideoRateAbbr video_rate_abbrs[]= {