Merge commit '709e1c91ea7a5bbf2b9a104642572ca7616b224f'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 2 May 2015 23:04:14 +0000 (01:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 2 May 2015 23:04:14 +0000 (01:04 +0200)
commit0ba65c9f795a1d3ad842f6d3179472e35c73541c
tree3ee27fb796ef6856c1e412156055d61556780c25
parenta72b61a317b0bca3e8e9c036617e9cec0c9705d0
parent709e1c91ea7a5bbf2b9a104642572ca7616b224f
Merge commit '709e1c91ea7a5bbf2b9a104642572ca7616b224f'

* commit '709e1c91ea7a5bbf2b9a104642572ca7616b224f':
  avprobe: Print the display matrix from per-stream sidedata

Conflicts:
avprobe.c

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