Merge commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Mar 2013 12:00:39 +0000 (13:00 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Mar 2013 12:00:39 +0000 (13:00 +0100)
commitac1a1fd7088ca903ff3c568612d6a7c2126772a9
treef04f088b1a9c591763c1f462107fbfa54d039601
parent705b607db88f4578e1d1c8b0c467cbc23256861e
parent1ae44c87c924b69a0657256fbaa8ad140df2f27c
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>
Changelog
doc/ffmpeg.texi
ffmpeg.c
ffmpeg.h
ffmpeg_opt.c
tests/fate/filter.mak