diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 22:39:24 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 22:39:24 +0100 |
| commit | 7f9527d30fa9e875a088f5da97419afcbc17388d (patch) | |
| tree | cac88a8571c4ec999dfd74c09477721914471000 /doc/examples/metadata.c | |
| parent | 60feb8543a568e15228c7d4531a9c665868df97e (diff) | |
| parent | aace8b184c867875e2715b2af23fa98886f90427 (diff) | |
| download | ffmpeg-7f9527d30fa9e875a088f5da97419afcbc17388d.tar.gz | |
Merge commit 'aace8b184c867875e2715b2af23fa98886f90427' into release/0.10
* commit 'aace8b184c867875e2715b2af23fa98886f90427':
Prepare for 0.8.17 Release
Conflicts:
RELEASE
not merged
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples/metadata.c')
0 files changed, 0 insertions, 0 deletions