* commit '54bc15d5':
  id3v2: fix reading v2.2 attached pictures

Conflicts:
	libavformat/id3v2.c

See: 05c3c568Merged-by: Michael Niedermayer <michaelni@gmx.at>