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

Merge commit 'e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2' 

* commit 'e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2':
  parseutil: Add more resolution aliases

Conflicts:
	doc/ffmpeg.texi
	libavutil/parseutils.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2015-07-20 04:32:28 +02:00
parent cb53db144c e93ca480c9
commit 9ebe041e1c
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/utils.texi
View File

@ -238,6 +238,14 @@ The following abbreviations are recognized:
480x320
@item qhd
960x540
@item 2kdci
2048x1080
@item 4kdci
4096x2160
@item uhd1
3840x2160
@item uhd2
7680x4320
@end table
@anchor{video rate syntax}

4
libavutil/parseutils.c
View File

@ -111,9 +111,11 @@ static const VideoSizeAbbr video_size_abbrs[] = {
{ "hd720", 1280, 720 },
{ "hd1080", 1920,1080 },
{ "2k", 2048,1080 }, /* Digital Cinema System Specification */
{ "2kdci", 2048,1080 },
{ "2kflat", 1998,1080 },
{ "2kscope", 2048, 858 },
{ "4k", 4096,2160 }, /* Digital Cinema System Specification */
{ "4kdci", 4096,2160 },
{ "4kflat", 3996,2160 },
{ "4kscope", 4096,1716 },
{ "nhd", 640,360 },
@ -122,6 +124,8 @@ static const VideoSizeAbbr video_size_abbrs[] = {
{ "fwqvga", 432,240 },
{ "hvga", 480,320 },
{ "qhd", 960,540 },
{ "uhd1", 3840,2160 },
{ "uhd2", 7680,4320 },
};
static const VideoRateAbbr video_rate_abbrs[]= {