diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-13 11:51:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-13 11:54:38 +0100 |
| commit | c74b3983f99a2a177904bd0b997528c1185e1231 (patch) | |
| tree | 7c7a50d8b61497edbc6c1f542775af4bfcd6e5ab /libswresample/aarch64/Makefile | |
| parent | 8bb489fab54ae303c687462c54d990d4b43e74a9 (diff) | |
| parent | faa8ffda2c513573733624784f0a7d0a4959d33e (diff) | |
| download | ffmpeg-c74b3983f99a2a177904bd0b997528c1185e1231.tar.gz | |
Merge commit 'faa8ffda2c513573733624784f0a7d0a4959d33e'
* commit 'faa8ffda2c513573733624784f0a7d0a4959d33e':
doc/APIchanges: fill in missing dates and hashes
Conflicts:
doc/APIchanges
See: c651a1aaecb5cb7bb40cf40df27f5273e8bcd245
See: 8c8ee17e8d2800144116ec52f26a435a06b49420 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/aarch64/Makefile')
0 files changed, 0 insertions, 0 deletions