Michael Niedermayer
ac1a1fd708
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>
2013-03-28 13:00:39 +01:00
..
2012-10-08 11:22:42 +02:00
2013-03-14 21:39:15 +01:00
2013-03-20 21:04:28 +01:00
2012-12-19 09:33:43 +01:00
2013-03-27 01:44:20 +01:00
2011-05-11 13:43:30 +02:00
2013-02-18 13:04:29 +01:00
2012-02-09 12:26:45 +01:00
2012-12-06 10:16:10 +01:00
2012-12-22 00:38:48 +01:00
2013-03-20 20:59:24 +01:00
2013-03-22 12:58:22 +01:00
2012-11-02 18:28:56 +01:00
2012-12-21 17:32:52 +01:00
2013-02-18 13:04:29 +01:00
2011-12-21 19:59:45 +01:00
2013-03-22 09:20:45 +01:00
2013-01-25 00:04:22 +01:00
2012-09-29 19:27:01 +02:00
2012-09-29 19:27:01 +02:00
2012-12-19 09:33:44 +01:00
2013-03-13 00:34:42 +01:00
2012-12-19 09:33:44 +01:00
2012-12-19 09:33:44 +01:00
2013-03-24 23:19:07 +01:00
2012-12-19 09:33:44 +01:00
2013-02-14 23:43:08 +01:00
2012-12-19 09:33:44 +01:00
2012-12-19 09:33:44 +01:00
2013-03-28 13:00:39 +01:00
2012-01-28 11:04:19 +01:00
2013-03-17 03:43:36 +01:00
2013-02-15 18:56:27 +01:00
2013-03-17 00:27:48 +01:00
2012-11-16 13:07:10 +01:00
2013-02-15 18:56:27 +01:00
2013-03-24 23:17:47 +01:00
2013-03-28 07:59:04 +01:00
2013-01-21 10:24:45 +00:00
2012-11-11 20:43:28 +01:00
2011-11-23 23:03:37 +01:00
2013-03-23 13:43:56 +01:00
2011-09-02 23:08:03 +02:00
2012-12-19 09:33:44 +01:00
2012-12-19 09:33:44 +01:00
2012-12-19 09:33:44 +01:00
2012-12-19 09:33:44 +01:00
2012-12-19 09:33:44 +01:00
2012-12-19 09:33:44 +01:00
2012-12-19 09:33:44 +01:00
2013-01-24 14:35:15 +01:00
2011-03-17 17:26:45 +01:00
2013-03-23 16:19:38 +01:00
2013-03-12 03:23:28 +01:00
2013-03-07 01:44:59 +01:00
2013-01-06 16:30:02 +01:00
2013-01-23 17:44:56 +01:00
2013-02-18 13:04:29 +01:00
2013-02-13 18:41:37 -05:00
2013-03-18 17:43:43 +01:00
2013-02-18 13:04:29 +01:00
2012-12-21 00:18:34 +01:00
2013-03-19 16:21:26 +01:00
2013-01-06 16:30:02 +01:00
2011-12-12 01:25:37 +01:00
2013-02-14 23:45:48 +01:00
2012-10-31 00:37:42 +01:00
2013-02-22 23:43:46 +01:00
2013-01-27 13:32:56 +01:00
2010-06-27 14:31:50 +00:00
2013-03-07 01:44:59 +01:00
2012-12-21 00:18:34 +01:00