[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr  3 22:18:26 2014 +0200| [5a18b215f7138c0bd59f27389050b0311fa4a549] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5a18b215f7138c0bd59f27389050b0311fa4a549
---