diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-03 22:18:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-03 22:18:26 +0200 |
| commit | 5a18b215f7138c0bd59f27389050b0311fa4a549 (patch) | |
| tree | 1e17a11d4b3cd8dbed19615940d30de719b8ea42 /libavresample | |
| parent | d9ac00ca7a8cabd8d19e580a42d9129b8831fa52 (diff) | |
| parent | 4ede1862dc62f4cac030a171099d8ec8a9b079ab (diff) | |
| download | ffmpeg-5a18b215f7138c0bd59f27389050b0311fa4a549.tar.gz | |
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>
Diffstat (limited to 'libavresample')
0 files changed, 0 insertions, 0 deletions