diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-10 13:37:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-10 13:37:42 +0100 |
| commit | 94bd5793198e13cca6bc4a73795532df8bc6f62e (patch) | |
| tree | 446560838fe3747ec6ed509a22aab996535b9934 /libavformat/utils.c | |
| parent | eb6d64edef4d965c228b122f5c7e018831362c82 (diff) | |
| parent | 473281193bed8dcb3f6954a18d03cf6298d651b3 (diff) | |
| download | ffmpeg-94bd5793198e13cca6bc4a73795532df8bc6f62e.tar.gz | |
Merge commit '473281193bed8dcb3f6954a18d03cf6298d651b3' into release/1.1
* commit '473281193bed8dcb3f6954a18d03cf6298d651b3':
Update Changelog for v9.18
Conflicts:
Changelog
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/utils.c')
0 files changed, 0 insertions, 0 deletions