starred/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2026-01-23 23:21:06 +01:00
Code Issues 5 Projects Packages Wiki Activity Actions

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