[FFmpeg-cvslog] Merge commit 'ca14a2d0e40720d018421e06995737e5682c33c9' into release/1.1
Michael Niedermayer
git at videolan.org
Mon Apr 21 17:29:44 CEST 2014
ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 21 17:23:39 2014 +0200| [fdcdfb36b74b3ae3cc2f2d6db4d3255d91dcd178] | committer: Michael Niedermayer
Merge commit 'ca14a2d0e40720d018421e06995737e5682c33c9' into release/1.1
* commit 'ca14a2d0e40720d018421e06995737e5682c33c9':
configure: Use the right pkgconf file for openjpeg
Conflicts:
configure
See: 182c674f68139f5613147fd9e0a7f196dc9c8bea
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fdcdfb36b74b3ae3cc2f2d6db4d3255d91dcd178
---
More information about the ffmpeg-cvslog
mailing list