Michael Niedermayer 608d86013a Merge commit 'e19e8aeeaaff3d4bc8f6065764c93f0298782ac6' ...

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

Conflicts:
	avprobe.c

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

2013-04-12 15:56:20 +02:00

18 KiB

Raw Blame History

View Raw