diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2015-08-16 19:37:46 -0400 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2015-08-18 15:41:06 -0400 |
| commit | 7a629186ba0481f4aef1d9590d0e55b3bc5f4ed0 (patch) | |
| tree | 30b0dfe6a669d22dbb608df88272585f179aa002 /libavcodec | |
| parent | 9468207e1cbacdf5e67fbab51e141796065eb146 (diff) | |
| download | ffmpeg-7a629186ba0481f4aef1d9590d0e55b3bc5f4ed0.tar.gz | |
Prepare for removal of obsolete FF_IDCT_* members.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 2 | ||||
| -rw-r--r-- | libavcodec/avdct.c | 2 | ||||
| -rw-r--r-- | libavcodec/options_table.h | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index f09d8f4a6b..41f373be4e 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 f92c691adb..3b622bac23 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 0fc343a0b2..93d4f779a4 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -201,9 +201,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"}, |