[FFmpeg-cvslog] Merge commit 'e19e8aeeaaff3d4bc8f6065764c93f0298782ac6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 12 15:56:20 2013 +0200| [608d86013a8663ef5f2fc8c74998750ed2019149] | committer: Michael Niedermayer

Merge commit 'e19e8aeeaaff3d4bc8f6065764c93f0298782ac6'

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

Conflicts:
	avprobe.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=608d86013a8663ef5f2fc8c74998750ed2019149
---