* commit 'e7c5e17d':
  vda: Make output CVPixelBuffer format configurable

Conflicts:
	doc/APIchanges
	libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>