ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Sat Sep 27
01:29:24 2014 +0200| [5a5d454dcce5add7674503f94bc2dc965f2fa111] | committer:
Michael Niedermayer
Merge commit 'd995f0a1550c9148140eab34c7d770e90925c004'
* commit 'd995f0a1550c9148140eab34c7d770e90925c004':
log: Unbreak no-tty support on 256color terminals
Conflicts:
libavutil/log.c
No change, FFmpeg is not affected by this bug
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5a5d454dcce5add7674503f94bc2dc965f2fa111
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
