Browse code

Merge commit 'a2eeed619de3bb257e82f0e06d1a580101bce54c'

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

Conflicts:
Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Michael Niedermayer authored on 2013/12/13 03:55:06
Showing 1 changed files
... ...
@@ -75,7 +75,7 @@ version 2.0:
75 75
 - 10% faster aac encoding on x86 and MIPS
76 76
 - sine audio filter source
77 77
 - WebP demuxing and decoding support
78
-- new ffmpeg options -filter_script and -filter_complex_script, which allow a
78
+- ffmpeg options -filter_script and -filter_complex_script, which allow a
79 79
   filtergraph description to be read from a file
80 80
 - OpenCL support
81 81
 - audio phaser filter
... ...
@@ -83,7 +83,7 @@ version 2.0:
83 83
 - libquvi demuxer
84 84
 - uniform options syntax across all filters
85 85
 - telecine filter
86
-- new interlace filter
86
+- interlace filter
87 87
 - smptehdbars source
88 88
 - inverse telecine filters (fieldmatch and decimate)
89 89
 - colorbalance filter