diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 23:09:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 23:09:55 +0100 |
| commit | 9575bd6a9d4c9527f09e3d906b338d6c184bafce (patch) | |
| tree | ed8ddb70bb9c3bfd5363758bd4c2a4e25646b96e /doc/examples/muxing.c | |
| parent | 90afa95a55a26bd407604e279f3bb551201ed6d7 (diff) | |
| parent | 76435f5e40854567252756ea7f788958dd2cc04c (diff) | |
| download | ffmpeg-9575bd6a9d4c9527f09e3d906b338d6c184bafce.tar.gz | |
Merge commit '76435f5e40854567252756ea7f788958dd2cc04c' into release/0.10
* commit '76435f5e40854567252756ea7f788958dd2cc04c':
doc: More changelog updates for v0.8.17
Conflicts:
Changelog
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples/muxing.c')
0 files changed, 0 insertions, 0 deletions