diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 20:38:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 20:38:08 +0100 |
| commit | 2ba0ef4b15ccfeb1b7dcdca7dcbcc0a3f77f18b8 (patch) | |
| tree | 359ed124774b05a0bbfe6629685efc2f8979d1cd /libavfilter/vf_drawbox.c | |
| parent | 693b8f11d7fd7eb44177eed9cbbddf63f3fc6bdb (diff) | |
| parent | 7a76c6c4df31d1ff65464ccf3171acd57ef004eb (diff) | |
| download | ffmpeg-2ba0ef4b15ccfeb1b7dcdca7dcbcc0a3f77f18b8.tar.gz | |
Merge commit '7a76c6c4df31d1ff65464ccf3171acd57ef004eb'
* commit '7a76c6c4df31d1ff65464ccf3171acd57ef004eb':
configure: Enable colored output for gcc 4.9+
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_drawbox.c')
0 files changed, 0 insertions, 0 deletions