diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-08 22:20:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-08 22:20:33 +0200 |
| commit | dc5560efda8e956b20bed2cb955f060733bc3200 (patch) | |
| tree | 12e5416c1d3a55deee674cb68310bedfb6bd4a7c | |
| parent | 10dd62737e1a12b6bb1d3e732ab905f48552543e (diff) | |
| parent | a2c00d22e71d13b72828147be86aa9e961c6cae6 (diff) | |
| download | ffmpeg-dc5560efda8e956b20bed2cb955f060733bc3200.tar.gz | |
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>
0 files changed, 0 insertions, 0 deletions