Merge commit '219b39a7'
* commit '219b39a7': parseutil: Use non ambiguous aliases for uhd Conflicts: doc/ffmpeg.texi libavutil/parseutils.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Showing
Please
register
or
sign in
to comment