Merge commit 'cb4cb7b0ea12b791dde587b1acd504dbb4ec8f41'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Feb 2015 20:49:51 +0000 (21:49 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Feb 2015 20:49:51 +0000 (21:49 +0100)
commit9ad8f55edaf20a73ebf42ad9f0398e96a1726690
tree655dc38d5590a7d68937cd1000144bf2a93b996d
parent83f18410bdcf149b58fb669cda65b1cdcdebf695
parentcb4cb7b0ea12b791dde587b1acd504dbb4ec8f41
Merge commit 'cb4cb7b0ea12b791dde587b1acd504dbb4ec8f41'

* commit 'cb4cb7b0ea12b791dde587b1acd504dbb4ec8f41':
  qsv: Skip qsv.h compilation if qsv is not enabled

Conflicts:
libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/Makefile