diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-05 00:43:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-05 00:53:50 +0200 |
| commit | 6b646fb9e2cea927a744dabb7c412a13a13d219d (patch) | |
| tree | fe3c30021964f9cd65de96606361e056d69b41ab /libavutil/log.h | |
| parent | 700bf1fa4e783ec078615f3b13dfad979f4d2ccf (diff) | |
| parent | 086a541857812b2e0435db38fbabfddc7d19e53c (diff) | |
| download | ffmpeg-6b646fb9e2cea927a744dabb7c412a13a13d219d.tar.gz | |
Merge commit '086a541857812b2e0435db38fbabfddc7d19e53c'
* commit '086a541857812b2e0435db38fbabfddc7d19e53c':
fate: png-suite
Conflicts:
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/log.h')
0 files changed, 0 insertions, 0 deletions