diff options
| author | Diego Biurrun <diego@biurrun.de> | 2014-08-06 06:19:15 -0700 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-08-08 11:13:30 -0700 |
| commit | d35b94fbabd8beb5d566c0b5d01688aff62c3b36 (patch) | |
| tree | 13579b5adb9acb57006fd614a61491a54410309c /libavcodec/options_table.h | |
| parent | 84d173d3de97c753234ab0c0b50551d51413d663 (diff) | |
avcodec: Rename xvidmmx IDCT to xvid
The Xvid IDCT is not MMX-specific.
Diffstat (limited to 'libavcodec/options_table.h')
| -rw-r--r-- | libavcodec/options_table.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 61cde0ff27..cf1f20a9fc 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -214,7 +214,10 @@ static const AVOption avcodec_options[] = { #if FF_API_UNUSED_MEMBERS {"ipp", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_IPP }, INT_MIN, INT_MAX, V|E|D, "idct"}, #endif /* FF_API_UNUSED_MEMBERS */ -{"xvidmmx", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_XVIDMMX }, INT_MIN, INT_MAX, V|E|D, "idct"}, +{"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 */ {"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}, {"ec", "set error concealment strategy", OFFSET(error_concealment), AV_OPT_TYPE_FLAGS, {.i64 = 3 }, INT_MIN, INT_MAX, V|D, "ec"}, |