diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-25 20:11:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-25 20:11:09 +0100 |
| commit | d32ea79ea2afdca9f7a3979dc4294b5275d410be (patch) | |
| tree | 96c93177cd6ca665c0d33e866b001c288f8efef7 /libavcodec/aacdec.c | |
| parent | 57eb787ed3fabe4eb996aa2aad3fd4b10fa5c878 (diff) | |
| parent | 6b156c45638ceb2e076586b7efeb4cf9e04e0a84 (diff) | |
| download | ffmpeg-d32ea79ea2afdca9f7a3979dc4294b5275d410be.tar.gz | |
Merge remote-tracking branch 'qatar/release/0.6' into release/0.6n0.6.4
* qatar/release/0.6:
Release notes and changelog for 0.6.4
Conflicts:
Changelog
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacdec.c')
0 files changed, 0 insertions, 0 deletions