* commit 'f5c4d38c':
  qsvdec: properly handle asynchronous decoding

Conflicts:
	libavcodec/qsvdec.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>