* commit '20f9cf74':
  vaapi: wrap codec specific functions in appropiate #ifs

Conflicts:
	libavcodec/vaapi.c

See: f2118d44Merged-by: Michael Niedermayer <michaelni@gmx.at>