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. Patch failed at 0001 vf_colorspace: add floyd-steinberg dithering option to full conversion. When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB I know you won't believe me, but the highest form of Human Excellence is to question oneself and others. -- Socrates
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
