* commit 'e19e8aee':
  avtools: move media_type_string() from avprobe to cmdutils.

Conflicts:
	avprobe.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>