diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-10 13:38:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-10 13:38:18 +0100 |
| commit | c5587516ca9155d575b9dd584ea746ebc2e333bd (patch) | |
| tree | 446560838fe3747ec6ed509a22aab996535b9934 /libavformat/utils.c | |
| parent | 94bd5793198e13cca6bc4a73795532df8bc6f62e (diff) | |
| parent | 42eaec076bbe2629c466695f71e7aa283a6fda51 (diff) | |
| download | ffmpeg-c5587516ca9155d575b9dd584ea746ebc2e333bd.tar.gz | |
Merge commit '42eaec076bbe2629c466695f71e7aa283a6fda51' into release/1.1
* commit '42eaec076bbe2629c466695f71e7aa283a6fda51':
Prepare for 9.18 Release
Conflicts:
RELEASE
not merged
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/utils.c')
0 files changed, 0 insertions, 0 deletions