diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 22:19:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 22:19:49 +0100 |
| commit | 525689ede90699df29aaa700fb45fd5659d4ce4e (patch) | |
| tree | ca8df4835e0d0d17d4db5c70caa24175b42d2d7d /doc/examples/muxing.c | |
| parent | c1f9be99d73787be8a45dc68f008e2a8ad91fd42 (diff) | |
| parent | 22103315c2a1cb2de336750c50cf6bf7c109220c (diff) | |
| download | ffmpeg-525689ede90699df29aaa700fb45fd5659d4ce4e.tar.gz | |
Merge commit '22103315c2a1cb2de336750c50cf6bf7c109220c' into release/0.10
* commit '22103315c2a1cb2de336750c50cf6bf7c109220c':
Add some bug references to the changelog
Conflicts:
Changelog
not merged as this isnt the FFmpeg Changelog
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples/muxing.c')
0 files changed, 0 insertions, 0 deletions