* commit '24e87f7f':
  Remove obsolete FF_API_PROBE_MIME cruft.

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