Merge commit 'a2c00d22e71d13b72828147be86aa9e961c6cae6'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Oct 2014 20:20:33 +0000 (22:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Oct 2014 20:20:33 +0000 (22:20 +0200)
commitdc5560efda8e956b20bed2cb955f060733bc3200
tree12e5416c1d3a55deee674cb68310bedfb6bd4a7c
parent10dd62737e1a12b6bb1d3e732ab905f48552543e
parenta2c00d22e71d13b72828147be86aa9e961c6cae6
Merge commit 'a2c00d22e71d13b72828147be86aa9e961c6cae6'

* commit 'a2c00d22e71d13b72828147be86aa9e961c6cae6':
  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: Michael Niedermayer <michaelni@gmx.at>