diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-09-10 17:05:51 +0200 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-09-13 17:34:45 +0200 |
| commit | 5b142a4d334bfa8ee5ec5f364c26c98ddb425fac (patch) | |
| tree | 9a385858f143a456c6d93881ff8bdba3cdfc6444 | |
| parent | 18adc1fd3bb739a240c59f87ec6837fdfa89d32e (diff) | |
lavc: Keep idct integer option
"int" is useful in testing because provides accurate results across
different plaftforms, so remove it from the scheduled FF_API_UNUSED_MEMBERS
deprecation.
| -rw-r--r-- | libavcodec/avcodec.h | 2 | ||||
| -rw-r--r-- | libavcodec/options_table.h | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 8a073d4c4f..8c635d7ed1 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2572,9 +2572,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/options_table.h b/libavcodec/options_table.h index b6e14681f8..b183f642d6 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -191,9 +191,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"}, |