* commit '117b4327':
  lavc: Introduce AVCodec internal capabilities

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