Commit 0ba65c9f authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '709e1c91'

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

Conflicts:
	avprobe.c

See: 08152f2dMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents a72b61a3 709e1c91
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment