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)
* commit '709e1c91ea7a5bbf2b9a104642572ca7616b224f':
  avprobe: Print the display matrix from per-stream sidedata

Conflicts:
avprobe.c

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

Trivial merge