[FFmpeg-cvslog] Merge commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 28 13:00:39 2013 +0100| [ac1a1fd7088ca903ff3c568612d6a7c2126772a9] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ac1a1fd7088ca903ff3c568612d6a7c2126772a9
---