diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 19:44:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 19:44:53 +0100 |
| commit | 5e708b4de3aaa8939ba551bc417754775530eba8 (patch) | |
| tree | 83bb21dbaf89eeaaa2a19c02526bc1bb8662c569 /libavformat/swf.h | |
| parent | 8528feb13cd320716478a5033919cb7656b41863 (diff) | |
| parent | ae9652605a9a3328d3f992925a37bde037dff2ee (diff) | |
| download | ffmpeg-5e708b4de3aaa8939ba551bc417754775530eba8.tar.gz | |
Merge remote-tracking branch 'qatar/release/0.8' into release/0.10
* qatar/release/0.8:
Changelog for 0.8.9
Conflicts:
Changelog
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/swf.h')
0 files changed, 0 insertions, 0 deletions