[FFmpeg-cvslog] Merge commit '2ce53880bfeb431decdd2fc82298c0aff823ab47'
Michael Niedermayer
git at videolan.org
Mon Jul 21 23:05:05 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jul 21 22:29:15 2014 +0200| [16c66f3151cfe54622492125b4c7654078582f96] | committer: Michael Niedermayer
Merge commit '2ce53880bfeb431decdd2fc82298c0aff823ab47'
* commit '2ce53880bfeb431decdd2fc82298c0aff823ab47':
build: Conditionally compile all avcodec test programs
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=16c66f3151cfe54622492125b4c7654078582f96
---
More information about the ffmpeg-cvslog
mailing list