Commit dc5560ef authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'a2c00d22'

* commit 'a2c00d22':
  avprobe: print color properties for show_streams

Conflicts:
	avprobe.c

Not merged as this code does not build and is incomplete, some parts only
appear in later commits.
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 10dd6273 a2c00d22
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