diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-25 04:12:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-25 04:12:26 +0100 |
| commit | 67dbf8bec977571120f2c70c60ea637fa8916dd6 (patch) | |
| tree | a5c56d4bb919d298ade11ab4e4a51e00065a3caa /libswresample/version.h | |
| parent | c724c82a78284368e8542630ce602bc591bb95c8 (diff) | |
| parent | 20f3cdf0c894a874fad5d76358fde6294acedeed (diff) | |
| download | ffmpeg-67dbf8bec977571120f2c70c60ea637fa8916dd6.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Include config.h from huffyuvdsp.h.
Include stddef from snow_dwt.h.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/version.h')
0 files changed, 0 insertions, 0 deletions