diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-04 02:08:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-04 02:09:20 +0200 |
| commit | a692ff93ef5ba90e07c3fdecf05359bdca9b9066 (patch) | |
| tree | 45f147f308e03fe292d127fa2ba98666880bde8c /libavcodec/aic.c | |
| parent | 7307a7fd936e9d228d331b67613d5c9454ad4476 (diff) | |
| parent | 9464b69da6b373d1eeb6b3d269ad029d9647b498 (diff) | |
| download | ffmpeg-a692ff93ef5ba90e07c3fdecf05359bdca9b9066.tar.gz | |
Merge commit '9464b69da6b373d1eeb6b3d269ad029d9647b498'
* commit '9464b69da6b373d1eeb6b3d269ad029d9647b498':
log: Unbreak windows support
Conflicts:
libavutil/log.c
No change as we didnt use print_256color() in our implementation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aic.c')
0 files changed, 0 insertions, 0 deletions