Merge commit 'a2eeed619de3bb257e82f0e06d1a580101bce54c'

* commit 'a2eeed619de3bb257e82f0e06d1a580101bce54c': changelog: drop redundant new attribute Conflicts: Changelog Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 93cf43ec3f
parent 2644df82e6 a2eeed619d
commit 93cf43ec3f
1 changed files with 2 additions and 2 deletions
--- a/4
+++ b/4
@ -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