[FFmpeg-cvslog] Merge commit 'a9a2f3613040c4f90bf15cbd76f8671252ecc043'
Michael Niedermayer
git at videolan.org
Sun Jul 12 21:31:14 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sun Jul 12 21:23:16 2015 +0200| [6727380d0527a62fc4067048aaefd1e226313c81] | committer: Michael Niedermayer
Merge commit 'a9a2f3613040c4f90bf15cbd76f8671252ecc043'
* commit 'a9a2f3613040c4f90bf15cbd76f8671252ecc043':
doc: add a section about building with libmfx
Conflicts:
doc/general.texi
Merged-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6727380d0527a62fc4067048aaefd1e226313c81
---
More information about the ffmpeg-cvslog
mailing list