Merge commit '0fbb271318899a0fb1fbcbb3db8292e909b91e23'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Feb 2015 20:12:29 +0000 (21:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Feb 2015 20:12:33 +0000 (21:12 +0100)
commit99bcfe62278ffc11e2665e653dcb90336ec8d7ff
tree27d489d4da8c96afd240c337159ad46b10336b7c
parentac649bb775b9635db6810cb200ef81a777368e4a
parent0fbb271318899a0fb1fbcbb3db8292e909b91e23
Merge commit '0fbb271318899a0fb1fbcbb3db8292e909b91e23'

* commit '0fbb271318899a0fb1fbcbb3db8292e909b91e23':
  qsv_api: fix building with libmfx disabled

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