Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-08 06:09:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge commit '219b39a71a'

Browse source 
* commit '219b39a71a':
  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
commit be0fd07457
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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