diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-20 04:32:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-20 04:32:28 +0200 |
| commit | 9ebe041e1ca898ed725051460961f1fda5f7a20b (patch) | |
| tree | 716df11c495620ee39366c329b9f4b8d068ce3ce /doc/utils.texi | |
| parent | cb53db144c104f447782b8918e94704484aedc8b (diff) | |
| parent | e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2 (diff) | |
| download | ffmpeg-9ebe041e1ca898ed725051460961f1fda5f7a20b.tar.gz | |
Merge commit 'e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2'
* commit 'e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2':
parseutil: Add more resolution aliases
Conflicts:
doc/ffmpeg.texi
libavutil/parseutils.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'doc/utils.texi')
| -rw-r--r-- | doc/utils.texi | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/utils.texi b/doc/utils.texi index 6517ac0a97..a0073af656 100644 --- a/doc/utils.texi +++ b/doc/utils.texi @@ -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} |