diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-19 11:08:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-19 11:08:38 +0200 |
| commit | 25ffaf52770253a5bfce353dc3d30637664e5e60 (patch) | |
| tree | 7506a67fb00f5780aa86df5c265a41148650d302 /libavresample/avresample-test.c | |
| parent | c88503e3f6bd7881f147d340bf222a629daa55fc (diff) | |
| parent | 910042072a88cdf64490e31f0b791caaaaf07a92 (diff) | |
| download | ffmpeg-25ffaf52770253a5bfce353dc3d30637664e5e60.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
compat: Add missing license boilerplates
Conflicts:
compat/tms470/math.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/avresample-test.c')
0 files changed, 0 insertions, 0 deletions