* commit 'ebc29519':
  hwaccel: Support specific frame allocators

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