On Mon, Sep 15, 2014 at 11:32:52PM +0100, Vittorio Giovara wrote: > On Mon, Sep 15, 2014 at 11:24 PM, Diego Biurrun <[email protected]> wrote: > > (cherry picked from commit 65345a5a30a0e866b6944c0e6184be3feca04335) > > Signed-off-by: Diego Biurrun <[email protected]> > > > > Conflicts: > > libavutil/cpu.c > > libavutil/cpu.h > > --- > > Imho commit log can be reduced
Reinhard used to keep those, I'm maintaining tradition. > > --- a/libavutil/cpu.h > > +++ b/libavutil/cpu.h > > @@ -41,6 +41,7 @@ > > #define AV_CPU_FLAG_XOP 0x0400 ///< Bulldozer XOP functions > > #define AV_CPU_FLAG_FMA4 0x0800 ///< Bulldozer FMA4 functions > > #define AV_CPU_FLAG_IWMMXT 0x0100 ///< XScale IWMMXT > > +#define AV_CPU_FLAG_CMOV 0x1000 ///< i686 cmov > > #define AV_CPU_FLAG_ALTIVEC 0x0001 ///< standard > > Adding stuff to a public header should need a version bump (and > APIChange entry). > Not sure if this holds true for release branches, but I suppose so. The original commit that I cherry-picked didn't do it. Probably because it either predates APIChanges or at least the disciplined use of it. I'll bump micro; adding a define should be perfectly safe. Diego _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
