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-11-29 13:24:48 +00:00
2012-11-20 00:26:46 -05:00
2012-10-18 13:12:28 +01:00
2012-12-07 11:34:16 +01:00
2012-12-03 01:34:14 +01:00
2013-02-24 19:27:26 +00:00
2013-03-05 11:44:58 +00:00
2012-10-18 13:12:28 +01:00
2012-10-18 13:12:28 +01:00