diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-25 20:19:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-25 20:19:13 +0100 |
| commit | 8755a7890ec60d26c387db5cb48470bcf1f6630e (patch) | |
| tree | 26e2dd3383cf753020e993d3c4b07e0faa3815a3 /libavcodec/smacker.c | |
| parent | 0e05292a6c443bc3eec160d5b0af107bb91e074d (diff) | |
| parent | d0688fdd3101d900a3e3aac4e36bf7ef1eae01ad (diff) | |
| download | ffmpeg-8755a7890ec60d26c387db5cb48470bcf1f6630e.tar.gz | |
Merge remote-tracking branch 'qatar/release/0.5' into release/0.5
* qatar/release/0.5:
Release notes and changelog for 0.5.6
Conflicts:
RELEASE
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/smacker.c')
0 files changed, 0 insertions, 0 deletions