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)
* commit 'a4baf96abd64cda68e3e4692b182bdf60745a14d':
  avprobe: rename the prettyprint structures
  tools: Wording and formatting cosmetics

Conflicts:
avprobe.c

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

Simple merge
Simple merge