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

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