diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-19 18:33:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-19 18:33:46 +0200 |
| commit | c18a3b3e8ef438c8cd18969f8d87fd7c2201cf32 (patch) | |
| tree | 398aa4126677aef21691a4c86cbffe6af0824abd /libswresample | |
| parent | b07dc81a9e35ddd2b2ac0109ae2e97b86ff4a4a9 (diff) | |
| parent | 8bc52dbd9dffb1b2fa4a6aeed2d298d036b619b2 (diff) | |
| download | ffmpeg-c18a3b3e8ef438c8cd18969f8d87fd7c2201cf32.tar.gz | |
Merge commit '8bc52dbd9dffb1b2fa4a6aeed2d298d036b619b2'
* commit '8bc52dbd9dffb1b2fa4a6aeed2d298d036b619b2':
vfwcap: Drop fallback VfW defines
Conflicts:
libavdevice/vfwcap.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample')
0 files changed, 0 insertions, 0 deletions