Merge commit '219b39a71a5694b1c14a07b86477f665a5b6849b'
authorMichael Niedermayer <michael@niedermayer.cc>
Tue, 21 Jul 2015 14:55:39 +0000 (16:55 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Tue, 21 Jul 2015 14:55:39 +0000 (16:55 +0200)
commitbe0fd074579cd50149a0cff88111bf1b6efb310a
treefd33b47f57afbe623172d56523594e7bdd2f79d4
parent593731efa8eebf2dac3d1e751ccce90173b3097f
parent219b39a71a5694b1c14a07b86477f665a5b6849b
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>
doc/utils.texi
libavutil/parseutils.c