* qatar/master:
  codec_desc: group image codecs together

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