Hi, On Fri, May 6, 2016 at 10:14 AM, Michael Niedermayer <mich...@niedermayer.cc > wrote:
> On Fri, May 06, 2016 at 09:06:01AM -0400, Ronald S. Bultje wrote: > > --- > > doc/filters.texi | 13 ++++ > > libavfilter/colorspacedsp.c | 13 ++++ > > libavfilter/colorspacedsp.h | 6 ++ > > libavfilter/colorspacedsp_template.c | 128 > +++++++++++++++++++++++++++++++++++ > > libavfilter/vf_colorspace.c | 64 +++++++++++++++++- > > 5 files changed, 221 insertions(+), 3 deletions(-) > > i cant test this: > > Applying: vf_colorspace: add floyd-steinberg dithering option to full > conversion. > fatal: sha1 information is lacking or useless > (libavfilter/vf_colorspace.c). > Repository lacks necessary blobs to fall back on 3-way merge. > Cannot fall back to three-way merge. https://github.com/rbultje/ffmpeg/commits/colorspace Ronald _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
