RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Michael Niedermayer 2015-07-21 16:55:39 +02:00
parent 593731efa8 219b39a71a
commit be0fd07457
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/utils.texi
View File

@ -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

4
libavutil/parseutils.c
View File

@ -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[]= {