-
Michael Niedermayer authored
* qatar/master: log: Do not assume the TERM variable is always set Conflicts: libavutil/log.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
5a18b215
* qatar/master:
log: Do not assume the TERM variable is always set
Conflicts:
libavutil/log.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>