[FFmpeg-cvslog] Merge commit '5926603ad65e5fd4fefe8f0d72c381059f71cd59'
Michael Niedermayer
git at videolan.org
Tue Mar 11 21:17:21 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 11 21:12:42 2014 +0100| [a1b92569db6597bb4a662865564e7905a945264f] | committer: Michael Niedermayer
Merge commit '5926603ad65e5fd4fefe8f0d72c381059f71cd59'
* commit '5926603ad65e5fd4fefe8f0d72c381059f71cd59':
configure: Document --pkg-config option
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a1b92569db6597bb4a662865564e7905a945264f
---
More information about the ffmpeg-cvslog
mailing list