diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-27 01:29:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-27 01:29:24 +0200 |
| commit | 5a5d454dcce5add7674503f94bc2dc965f2fa111 (patch) | |
| tree | abe454bfa47e1b12a1dbb123c6456f97e53d921c /libavcodec/adpcm.h | |
| parent | a9ea79bb4976382b5648647013290ab61cf031e7 (diff) | |
| parent | d995f0a1550c9148140eab34c7d770e90925c004 (diff) | |
| download | ffmpeg-5a5d454dcce5add7674503f94bc2dc965f2fa111.tar.gz | |
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 <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/adpcm.h')
0 files changed, 0 insertions, 0 deletions