* commit 'adfa53d6':
  lavc: remove disabled FF_API_VDA_ASYNC cruft

Conflicts:
	libavcodec/vda.h
	libavcodec/vda_h264.c
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>