On Fri, 25 Jul 2014 16:31:24 -0700, Diego Biurrun <[email protected]> wrote: > --- > libavcodec/avcodec.h | 2 ++ > libavcodec/options_table.h | 2 ++ > libavcodec/version.h | 3 +++ > 3 files changed, 7 insertions(+) > > diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h > index cc74aee..e486bfd 100644 > --- a/libavcodec/avcodec.h > +++ b/libavcodec/avcodec.h > @@ -2455,7 +2455,9 @@ typedef struct AVCodecContext { > #define FF_IDCT_SH4 9 > #endif > #define FF_IDCT_SIMPLEARM 10 > +#if FF_API_IDCT_IPP > #define FF_IDCT_IPP 13 > +#endif > #define FF_IDCT_XVIDMMX 14 > #define FF_IDCT_SIMPLEARMV5TE 16 > #define FF_IDCT_SIMPLEARMV6 17 > diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h > index c40a6ce..6d2dc30 100644 > --- a/libavcodec/options_table.h > +++ b/libavcodec/options_table.h > @@ -207,7 +207,9 @@ static const AVOption avcodec_options[] = { > #if FF_API_ARCH_ALPHA > {"simplealpha", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEALPHA }, > INT_MIN, INT_MAX, V|E|D, "idct"}, > #endif > +#if FF_API_IDCT_IPP > {"ipp", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_IPP }, INT_MIN, INT_MAX, > V|E|D, "idct"}, > +#endif > {"xvidmmx", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_XVIDMMX }, INT_MIN, > INT_MAX, V|E|D, "idct"}, > {"faani", "floating point AAN IDCT", 0, AV_OPT_TYPE_CONST, {.i64 = > FF_IDCT_FAAN }, INT_MIN, INT_MAX, V|D|E, "idct"}, > {"slice_count", NULL, OFFSET(slice_count), AV_OPT_TYPE_INT, {.i64 = DEFAULT > }, INT_MIN, INT_MAX}, > diff --git a/libavcodec/version.h b/libavcodec/version.h > index 99ba631..7c9f10a 100644 > --- a/libavcodec/version.h > +++ b/libavcodec/version.h > @@ -129,6 +129,9 @@ > #ifndef FF_API_ARCH_SPARC > #define FF_API_ARCH_SPARC (LIBAVCODEC_VERSION_MAJOR < 56) > #endif > +#ifndef FF_API_IDCT_IPP > +#define FF_API_IDCT_IPP (LIBAVCODEC_VERSION_MAJOR < 56) > +#endif
Adding a separate FF_API macro for each such tiny deprecation seems a bit overkill to me, but whatever. You should add a note to APIchanges though -- Anton Khirnov _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
