diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-21 16:55:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-21 16:55:39 +0200 |
| commit | be0fd074579cd50149a0cff88111bf1b6efb310a (patch) | |
| tree | fd33b47f57afbe623172d56523594e7bdd2f79d4 /libavutil/parseutils.c | |
| parent | 593731efa8eebf2dac3d1e751ccce90173b3097f (diff) | |
| parent | 219b39a71a5694b1c14a07b86477f665a5b6849b (diff) | |
| download | ffmpeg-streaming-be0fd074579cd50149a0cff88111bf1b6efb310a.zip ffmpeg-streaming-be0fd074579cd50149a0cff88111bf1b6efb310a.tar.gz | |
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>
Diffstat (limited to 'libavutil/parseutils.c')
| -rw-r--r-- | libavutil/parseutils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavutil/parseutils.c b/libavutil/parseutils.c index 90135bc..9fb8d0a 100644 --- a/libavutil/parseutils.c +++ b/libavutil/parseutils.c @@ -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[]= { |
