• Michael Niedermayer's avatar
    Merge commit '1ae44c87' · ac1a1fd7
    Michael Niedermayer authored
    * commit '1ae44c87':
      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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    ac1a1fd7
ffmpeg.texi 53.5 KB