Skip to content

F
ffmpeg.wasm-core
Commit 219b39a7 authored by Luca Barbato's avatar Luca Barbato
Browse files
Options

parseutil: Use non ambiguous aliases for uhd 

uhd1 and uhd2 would be ambigous.
parent 9ed6f9a1
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
doc/avconv.texi
View file @ 219b39a7
...@@ -497,9 +497,9 @@ abbreviations are recognized: ...@@ -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
......
libavutil/parseutils.c
View file @ 219b39a7
...@@ -82,8 +82,8 @@ static const VideoSizeAbbr video_size_abbrs[] = { ...@@ -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[]= {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment