diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-03 20:40:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-03 20:44:14 +0200 |
| commit | c16e00618122a7f1217f5174a6c4013eb57421b0 (patch) | |
| tree | a89cf01819d097408ed3ce96d3d7cc28e399149e /libavformat/mxfdec.c | |
| parent | 061e340c05bde91ac988677e47bc562b04be5c20 (diff) | |
| parent | 7763118cae4eb468b032dbd29af15a011c2c233b (diff) | |
| download | ffmpeg-c16e00618122a7f1217f5174a6c4013eb57421b0.tar.gz | |
Merge commit '7763118cae4eb468b032dbd29af15a011c2c233b'
* commit '7763118cae4eb468b032dbd29af15a011c2c233b':
log: Support for 256color terminals
Conflicts:
doc/APIchanges
libavutil/log.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mxfdec.c')
0 files changed, 0 insertions, 0 deletions