ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Mon Feb 23
21:49:51 2015 +0100| [9ad8f55edaf20a73ebf42ad9f0398e96a1726690] | committer:
Michael Niedermayer
Merge commit 'cb4cb7b0ea12b791dde587b1acd504dbb4ec8f41'
* commit 'cb4cb7b0ea12b791dde587b1acd504dbb4ec8f41':
qsv: Skip qsv.h compilation if qsv is not enabled
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9ad8f55edaf20a73ebf42ad9f0398e96a1726690
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
