diff options
| author | Michael Niedermayer <[email protected]> | 2013-09-17 17:09:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-09-17 17:09:58 +0200 |
| commit | 09887096734eabaac5454b3fb5e4489457ac9434 (patch) | |
| tree | 8cca2895503b4d1372f0b485fd9cb8fd1d4d4f76 /libswscale/utils.c | |
| parent | 102a1d9239fcfe37a8cee5a691d7533e5eb347fa (diff) | |
| parent | c38854c39929145bee07cee5377a7202df591e18 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doc: Add missing hashes and dates to APIChanges
Conflicts:
doc/APIchanges
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libswscale/utils.c')
0 files changed, 0 insertions, 0 deletions