* commit 'b15b06eb':
  avformat: use const char* instead of uint8_t* for AVProbeData.mime_type

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