* commit 'e253a9e2':
  avformat: Move av_probe_input* to format.c

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