[FFmpeg-cvslog] Merge commit '06f4b1e37a08f3fd269ecbfeb0181129e5bfc86e'
Michael Niedermayer
git at videolan.org
Thu Apr 30 22:30:08 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 30 22:23:29 2015 +0200| [7ad528cf23da5479c7cbf4676d071a07a709d8b6] | committer: Michael Niedermayer
Merge commit '06f4b1e37a08f3fd269ecbfeb0181129e5bfc86e'
* commit '06f4b1e37a08f3fd269ecbfeb0181129e5bfc86e':
avplay: Do not print a possibly uninitialized value
Conflicts:
ffplay.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7ad528cf23da5479c7cbf4676d071a07a709d8b6
---
More information about the ffmpeg-cvslog
mailing list