diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-12 19:55:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-12 19:55:06 +0100 |
| commit | 93cf43ec3febaddfb34522bbcc2f04038c8e6e9e (patch) | |
| tree | 2f977854a4fea4ce8d1ebb91c3e846122c76baed /Changelog | |
| parent | 2644df82e6b3610eaf374352ed981bc5d48d2762 (diff) | |
| parent | a2eeed619de3bb257e82f0e06d1a580101bce54c (diff) | |
| download | ffmpeg-93cf43ec3febaddfb34522bbcc2f04038c8e6e9e.tar.gz | |
Merge commit 'a2eeed619de3bb257e82f0e06d1a580101bce54c'
* commit 'a2eeed619de3bb257e82f0e06d1a580101bce54c':
changelog: drop redundant new attribute
Conflicts:
Changelog
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Changelog')
| -rw-r--r-- | Changelog | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -75,7 +75,7 @@ version 2.0: - 10% faster aac encoding on x86 and MIPS - sine audio filter source - WebP demuxing and decoding support -- new ffmpeg options -filter_script and -filter_complex_script, which allow a +- ffmpeg options -filter_script and -filter_complex_script, which allow a filtergraph description to be read from a file - OpenCL support - audio phaser filter @@ -83,7 +83,7 @@ version 2.0: - libquvi demuxer - uniform options syntax across all filters - telecine filter -- new interlace filter +- interlace filter - smptehdbars source - inverse telecine filters (fieldmatch and decimate) - colorbalance filter |