[FFmpeg-cvslog] Merge commit '219b39a71a5694b1c14a07b86477f665a5b6849b'
Michael Niedermayer
git at videolan.org
Tue Jul 21 17:03:46 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Tue Jul 21 16:55:39 2015 +0200| [be0fd074579cd50149a0cff88111bf1b6efb310a] | committer: Michael Niedermayer
Merge commit '219b39a71a5694b1c14a07b86477f665a5b6849b'
* commit '219b39a71a5694b1c14a07b86477f665a5b6849b':
parseutil: Use non ambiguous aliases for uhd
Conflicts:
doc/ffmpeg.texi
libavutil/parseutils.c
Merged-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=be0fd074579cd50149a0cff88111bf1b6efb310a
---
More information about the ffmpeg-cvslog
mailing list