On Tue, Dec 23, 2014 at 10:51:09PM +0530, arwa arif wrote: > > > > > > > From 05dc64b0048547221f63824b4158701f8257e15c Mon Sep 17 00:00:00 2001 > > > From: Arwa Arif <arwaarif1...@gmail.com> > > > Date: Sun, 14 Dec 2014 12:03:31 +0530 > > > Subject: [PATCH] lavfi: port mp=fspp to a native libavfilter filter > > [...] > > > diff --git a/libavfilter/version.h b/libavfilter/version.h > > > index 4bd18f3..a405591 100644 > > > --- a/libavfilter/version.h > > > +++ b/libavfilter/version.h > > > @@ -30,8 +30,8 @@ > > > #include "libavutil/version.h" > > > > > > > > #define LIBAVFILTER_VERSION_MAJOR 5 > > > -#define LIBAVFILTER_VERSION_MINOR 2 > > > -#define LIBAVFILTER_VERSION_MICRO 104 > > > +#define LIBAVFILTER_VERSION_MINOR 5 > > > +#define LIBAVFILTER_VERSION_MICRO 99 > > What's this? Please skip this hunk altogether or update against latest > > master. > > > > > I tried to update against the latest master, but everything messed up. Can > you guide me how to do that?
git pull --rebase should work if your git is setup correctly [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Those who are too smart to engage in politics are punished by being governed by those who are dumber. -- Plato
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
