Merge commit 'e070d0a5'

* commit 'e070d0a5':
  frame: Remove some FF_API_AVFRAME_COLORSPACE leftovers

Conflicts:
	libavutil/frame.c

No change, as these leftovers have already been removed
Merged-by: Michael Niedermayer <michaelni@gmx.at>