[FFmpeg-cvslog] Merge commit 'a4baf96abd64cda68e3e4692b182bdf60745a14d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jul  7 11:35:59 2013 +0200| [b7ce510003275460a9b02361a8c98bfec6fa2945] | committer: Michael Niedermayer

Merge commit 'a4baf96abd64cda68e3e4692b182bdf60745a14d'

* commit 'a4baf96abd64cda68e3e4692b182bdf60745a14d':
  avprobe: rename the prettyprint structures
  tools: Wording and formatting cosmetics

Conflicts:
	avprobe.c

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

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