diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-09 14:49:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 17:30:27 +0200 |
| commit | 07262c719945bf417e5b2e9057de2bf4c84de075 (patch) | |
| tree | 9ddb82698e5d133b46c65bc09dfe7ae602bd0531 | |
| parent | 84bc45880ae14277cb804569401ddd34274f4764 (diff) | |
| download | ffmpeg-07262c719945bf417e5b2e9057de2bf4c84de075.tar.gz | |
avcodec/options_table: leave xvidmmx AVOption in place
Also mark it as deprecated through its help text
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/options_table.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 1c73aff28f..2e9dfa0178 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -224,9 +224,7 @@ static const AVOption avcodec_options[] = { {"ipp", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_IPP }, INT_MIN, INT_MAX, V|E|D, "idct"}, #endif /* FF_API_UNUSED_MEMBERS */ {"xvid", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_XVID }, INT_MIN, INT_MAX, V|E|D, "idct"}, -#if FF_API_IDCT_XVIDMMX -{"xvidmmx", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_XVID }, INT_MIN, INT_MAX, V|E|D, "idct"}, -#endif /* FF_API_IDCT_XVIDMMX */ +{"xvidmmx", "deprecated, for compatibility only", 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_XVID }, 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"}, {"simpleauto", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEAUTO }, INT_MIN, INT_MAX, V|E|D, "idct"}, {"slice_count", NULL, OFFSET(slice_count), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, |