ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Mon Mar 30
20:31:50 2015 +0200| [f5c7531ab1e69210df69b07ac6b21cb675f13b9e] | committer:
Michael Niedermayer
Merge commit '7d3183d3a4e800ab7a7fa24f49968a1b1bcc0161'
* commit '7d3183d3a4e800ab7a7fa24f49968a1b1bcc0161':
qsv: Skip header compilation depending on what parts of qsv are enabled
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f5c7531ab1e69210df69b07ac6b21cb675f13b9e
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
