Merge commit '709e1c91ea7a5bbf2b9a104642572ca7616b224f'

Browse Source

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

Conflicts:
	avprobe.c

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

...

This commit is contained in:

Michael Niedermayer 2015-05-03 01:04:14 +02:00

parent a72b61a317 709e1c91ea

commit 0ba65c9f79

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available