Commit 93cf43ec authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'a2eeed61'

* commit 'a2eeed61':
  changelog: drop redundant new attribute

Conflicts:
	Changelog
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 2644df82 a2eeed61
...@@ -75,7 +75,7 @@ version 2.0: ...@@ -75,7 +75,7 @@ version 2.0:
- 10% faster aac encoding on x86 and MIPS - 10% faster aac encoding on x86 and MIPS
- sine audio filter source - sine audio filter source
- WebP demuxing and decoding support - 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 filtergraph description to be read from a file
- OpenCL support - OpenCL support
- audio phaser filter - audio phaser filter
...@@ -83,7 +83,7 @@ version 2.0: ...@@ -83,7 +83,7 @@ version 2.0:
- libquvi demuxer - libquvi demuxer
- uniform options syntax across all filters - uniform options syntax across all filters
- telecine filter - telecine filter
- new interlace filter - interlace filter
- smptehdbars source - smptehdbars source
- inverse telecine filters (fieldmatch and decimate) - inverse telecine filters (fieldmatch and decimate)
- colorbalance filter - colorbalance filter
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment