diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-12 22:03:26 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-12 22:06:50 +0100 |
commit | e85296beae0a2a1ebe210c49cb6f13b8a37d8cf4 (patch) | |
tree | a1c5276b838e0591b86a71a0665e20cc8b73faad /ffpresets/libx264-superfast.ffpreset | |
parent | f1c9dbe40bf3011f4cb8ad01c6921f7807db4a81 (diff) | |
parent | 62c473934822afd317dfef27754a0ff71f58ce2a (diff) | |
download | ffmpeg-e85296beae0a2a1ebe210c49cb6f13b8a37d8cf4.tar.gz |
Merge remote-tracking branch 'qatar/release/0.6' into release/0.6
* qatar/release/0.6:
Release notes and changelog for 0.6.5
Bump version number for 0.6.5 release.
vorbis: An additional defense in the Vorbis codec.
vorbisdec: Fix decoding bug with channel handling
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffpresets/libx264-superfast.ffpreset')
0 files changed, 0 insertions, 0 deletions