diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-28 13:00:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-28 13:00:39 +0100 |
| commit | ac1a1fd7088ca903ff3c568612d6a7c2126772a9 (patch) | |
| tree | f04f088b1a9c591763c1f462107fbfa54d039601 /Changelog | |
| parent | 705b607db88f4578e1d1c8b0c467cbc23256861e (diff) | |
| parent | 1ae44c87c924b69a0657256fbaa8ad140df2f27c (diff) | |
| download | ffmpeg-ac1a1fd7088ca903ff3c568612d6a7c2126772a9.tar.gz | |
Merge commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c'
* commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c':
lavfi/gradfun: remove rounding to match C and SSE code.
lavfi/gradfun: fix dithering in MMX code.
lavfi/gradfun: fix rounding in MMX code.
lavfi/gradfun: do not increment DC pointer for odd values.
fate: filter: Add dependencies
avconv: add options for reading filtergraphs from a file.
Conflicts:
Changelog
doc/ffmpeg.texi
doc/filters.texi
ffmpeg.h
ffmpeg_opt.c
libavfilter/vf_gradfun.c
tests/fate/filter.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Changelog')
| -rw-r--r-- | Changelog | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -12,6 +12,8 @@ version <next>: - 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 + filtergraph description to be read from a file version 1.2: |