On Mon, 17 Aug 2015 18:02:17 -0400 "Ronald S. Bultje" <rsbul...@gmail.com> wrote:
> Hi, > > On Mon, Aug 17, 2015 at 5:45 PM, wm4 <nfx...@googlemail.com> wrote: > > > On Mon, 17 Aug 2015 15:41:03 -0400 > > "Ronald S. Bultje" <rsbul...@gmail.com> wrote: > > > > > --- > > > libavcodec/avcodec.h | 2 -- > > > libavcodec/avdct.c | 2 ++ > > > libavcodec/options_table.h | 2 -- > > > 3 files changed, 2 insertions(+), 4 deletions(-) > > > > > > diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h > > > index 6b824d5..6f9b026 100644 > > > --- a/libavcodec/avcodec.h > > > +++ b/libavcodec/avcodec.h > > > @@ -2947,9 +2947,7 @@ typedef struct AVCodecContext { > > > int dct_algo; > > > #define FF_DCT_AUTO 0 > > > #define FF_DCT_FASTINT 1 > > > -#if FF_API_UNUSED_MEMBERS > > > #define FF_DCT_INT 2 > > > -#endif /* FF_API_UNUSED_MEMBERS */ > > > #define FF_DCT_MMX 3 > > > #define FF_DCT_ALTIVEC 5 > > > #define FF_DCT_FAAN 6 > > > diff --git a/libavcodec/avdct.c b/libavcodec/avdct.c > > > index f92c691..3b622ba 100644 > > > --- a/libavcodec/avdct.c > > > +++ b/libavcodec/avdct.c > > > @@ -58,7 +58,9 @@ static const AVOption avdct_options[] = { > > > #if FF_API_ARCH_ALPHA > > > {"simplealpha", "experimental / for debugging", 0, AV_OPT_TYPE_CONST, > > {.i64 = FF_IDCT_SIMPLEALPHA }, INT_MIN, INT_MAX, V|E|D, "idct"}, > > > #endif > > > +#if FF_API_UNUSED_MEMBERS > > > {"ipp", "experimental / for debugging", 0, AV_OPT_TYPE_CONST, {.i64 = > > FF_IDCT_IPP }, INT_MIN, INT_MAX, V|E|D, "idct"}, > > > +#endif > > > {"xvid", "experimental / for debugging", 0, AV_OPT_TYPE_CONST, {.i64 = > > FF_IDCT_XVID }, INT_MIN, INT_MAX, V|E|D, "idct"}, > > > {"xvidmmx", "experimental / for debugging", 0, AV_OPT_TYPE_CONST, {.i64 > > = FF_IDCT_XVID }, INT_MIN, INT_MAX, V|E|D, "idct"}, > > > {"faani", "floating point AAN IDCT (experimental / for debugging)", 0, > > AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_FAAN }, INT_MIN, INT_MAX, V|D|E, "idct"}, > > > diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h > > > index fd9c045..8dabb65 100644 > > > --- a/libavcodec/options_table.h > > > +++ b/libavcodec/options_table.h > > > @@ -203,9 +203,7 @@ static const AVOption avcodec_options[] = { > > > {"dct", "DCT algorithm", OFFSET(dct_algo), AV_OPT_TYPE_INT, {.i64 = > > DEFAULT }, 0, INT_MAX, V|E, "dct"}, > > > {"auto", "autoselect a good one (default)", 0, AV_OPT_TYPE_CONST, {.i64 > > = FF_DCT_AUTO }, INT_MIN, INT_MAX, V|E, "dct"}, > > > {"fastint", "fast integer", 0, AV_OPT_TYPE_CONST, {.i64 = > > FF_DCT_FASTINT }, INT_MIN, INT_MAX, V|E, "dct"}, > > > -#if FF_API_UNUSED_MEMBERS > > > {"int", "accurate integer", 0, AV_OPT_TYPE_CONST, {.i64 = FF_DCT_INT }, > > INT_MIN, INT_MAX, V|E, "dct"}, > > > -#endif /* FF_API_UNUSED_MEMBERS */ > > > {"mmx", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DCT_MMX }, INT_MIN, > > INT_MAX, V|E, "dct"}, > > > {"altivec", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_DCT_ALTIVEC }, > > INT_MIN, INT_MAX, V|E, "dct"}, > > > {"faan", "floating point AAN DCT", 0, AV_OPT_TYPE_CONST, {.i64 = > > FF_DCT_FAAN }, INT_MIN, INT_MAX, V|E, "dct"}, > > > > I guess these weren't really unused, while "ipp" can go? > > > Right, "int" is used in various fate tests and I can't be bothered to > figure out whether that's useful or not. "ipp" is unused except for the > mention in avdct.c, so removing that makes everyone happy. OK then. _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel