[FFmpeg-cvslog] Merge commit '1bccf68caeee787139f22679e1300a5eea048cf5' into release/1.1
Michael Niedermayer
git at videolan.org
Mon Apr 21 16:32:38 CEST 2014
ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 21 16:26:32 2014 +0200| [47e18e2e03c92a9e344e98c021021248408754db] | committer: Michael Niedermayer
Merge commit '1bccf68caeee787139f22679e1300a5eea048cf5' into release/1.1
* commit '1bccf68caeee787139f22679e1300a5eea048cf5':
build: Use pkg-config for openjpeg
Conflicts:
configure
See: 9c99bc1f3fb974f07bc9b565dad00d0e162a09c1
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=47e18e2e03c92a9e344e98c021021248408754db
---
More information about the ffmpeg-cvslog
mailing list