ffmpeg | branch: release/2.4 | Michael Niedermayer <[email protected]> | Fri Feb
13 20:29:11 2015 +0100| [9d1e775b8966ed397f5819fe36dc933f8049b75e] | committer:
Michael Niedermayer
Merge commit '891de4b27a07b808839b9e873b6a886248c8fd6b' into release/2.4
* commit '891de4b27a07b808839b9e873b6a886248c8fd6b':
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=9d1e775b8966ed397f5819fe36dc933f8049b75e
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
