Merge commit 'a4baf96abd64cda68e3e4692b182bdf60745a14d'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 7 Jul 2013 09:35:59 +0000 (11:35 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 7 Jul 2013 09:35:59 +0000 (11:35 +0200)
commitb7ce510003275460a9b02361a8c98bfec6fa2945
tree724100234911165f50bce4621ba25cb5eb5e5d9e
parent7bd417c22a90a712df57cacfa5b09c1fb4f6183a
parenta4baf96abd64cda68e3e4692b182bdf60745a14d
Merge commit 'a4baf96abd64cda68e3e4692b182bdf60745a14d'

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

Conflicts:
avprobe.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tools/graph2dot.c
tools/pktdumper.c