diff options
| author | Michael Niedermayer <[email protected]> | 2011-09-18 22:26:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2011-09-18 22:26:46 +0200 |
| commit | 96c93b8ceb6c95335ed8fc743956e46dd1ccfae5 (patch) | |
| tree | e07408dea8f6163d6f07a34db44f8c338c26bc4e /libswresample/resample2.c | |
| parent | 4bc447a3c5ef4e69b54cc20857335e8dd5bca60c (diff) | |
| parent | 7f9b0ef9a82f6d1c839bfda8c5f498493a99998d (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doc/APIChanges: fill in missing hashes and dates.
Conflicts:
doc/APIchanges
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libswresample/resample2.c')
0 files changed, 0 insertions, 0 deletions