* commit 'ae3822bc':
  imgconvert: remove PixFmtInfo

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