diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 22:49:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 22:49:09 +0100 |
| commit | cb4da0405d3453d9a7cf55237a44e8f8939f4be4 (patch) | |
| tree | cac88a8571c4ec999dfd74c09477721914471000 /doc/examples/muxing.c | |
| parent | 7f9527d30fa9e875a088f5da97419afcbc17388d (diff) | |
| parent | 8b1f8fb26bfe6a4cd9f72b962b45643fa331dbe1 (diff) | |
| download | ffmpeg-cb4da0405d3453d9a7cf55237a44e8f8939f4be4.tar.gz | |
Merge commit '8b1f8fb26bfe6a4cd9f72b962b45643fa331dbe1' into release/0.10
* commit '8b1f8fb26bfe6a4cd9f72b962b45643fa331dbe1':
Update Changelog for 0.8.17 Release
Conflicts:
Changelog
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples/muxing.c')
0 files changed, 0 insertions, 0 deletions