Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 3 Apr 2014 20:18:26 +0000 (22:18 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 3 Apr 2014 20:18:26 +0000 (22:18 +0200)
commit5a18b215f7138c0bd59f27389050b0311fa4a549
tree1e17a11d4b3cd8dbed19615940d30de719b8ea42
parentd9ac00ca7a8cabd8d19e580a42d9129b8831fa52
parent4ede1862dc62f4cac030a171099d8ec8a9b079ab
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  log: Do not assume the TERM variable is always set

Conflicts:
libavutil/log.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/log.c