ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Thu Jul 9
12:39:54 2015 +0200| [4a5074d7987e985645484c269e6f01faeec62da5] | committer:
Michael Niedermayer
Merge commit '84b223cc6d6ed4cc8bd295457a90f7c94a9dd784'
* commit '84b223cc6d6ed4cc8bd295457a90f7c94a9dd784':
configure: Make the new qsv encoder depend on libmfx
Conflicts:
configure
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4a5074d7987e985645484c269e6f01faeec62da5
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
