[FFmpeg-devel] [PATCH 1/3] vf_colorspace: add floyd-steinberg dithering option to full conversion.

[Ronald S. Bultje]

Hi,

On Fri, May 6, 2016 at 2:55 PM, Michael Niedermayer <michael at niedermayer.cc>
wrote:

> On Fri, May 06, 2016 at 01:17:56PM -0400, Ronald S. Bultje wrote:
> > Hi,
> >
> > On Fri, May 6, 2016 at 10:14 AM, Michael Niedermayer
> <michael at 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
>
>
> --- ./tests/ref/lavf/mov        2016-05-05 02:36:06.272607621 +0200
> +++ tests/data/fate/lavf-mov    2016-05-06 20:52:39.831813922 +0200
> @@ -13,9 +13,9 @@
>  ebca72c186a4f3ba9bb17d9cb5b74fef *./tests/data/lavf/lavf.mp4
>  312457 ./tests/data/lavf/lavf.mp4
>  ./tests/data/lavf/lavf.mp4 CRC=0x9d9a638a
> -9944512475d82d2d601f3c96101bdf9c *./tests/data/lavf/lavf.mp4
> -321343 ./tests/data/lavf/lavf.mp4
> -./tests/data/lavf/lavf.mp4 CRC=0xe8130120
> +38b6bcf55731a5905f58c071e8961d4d *./tests/data/lavf/lavf.mp4
> +312570 ./tests/data/lavf/lavf.mp4
> +./tests/data/lavf/lavf.mp4 CRC=0xb5cb0057
>  7b3e71f294901067046c09f03a426bdc *./tests/data/lavf/lavf.mp4
>  312001 ./tests/data/lavf/lavf.mp4
>  ./tests/data/lavf/lavf.mp4 CRC=0x9d9a638a
> Test lavf-mov failed. Look at tests/data/fate/lavf-mov.err for details.
> make: *** [fate-lavf-mov] Error 1
> git bisect bad
> c9b2411cae0e604697b5daf7413077fe325c4208 is the first bad commit
> commit c9b2411cae0e604697b5daf7413077fe325c4208
> Author: Ronald S. Bultje <rsbultje at gmail.com>
> Date:   Mon Feb 15 08:29:40 2016 -0500
>
>     mov: set variable fps flag.


I'll remove that commit, it's something unrelated that was dangling in my
tree...

Ronald