diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 16:14:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 16:14:41 +0100 |
| commit | 5f61e09a8f28af45d7db1f5e7767d14322255f49 (patch) | |
| tree | df4e8ce30cb60c7fe5a559529dcd2a03bdc22afb /libavcodec/options_table.h | |
| parent | db23d5de27187dd8f2ec5c6dfd98a8a363b0fda5 (diff) | |
| parent | 93af2734ee609133eaeca28329d7f13241dd411f (diff) | |
Merge commit '93af2734ee609133eaeca28329d7f13241dd411f'
* commit '93af2734ee609133eaeca28329d7f13241dd411f':
lavc: put FF_IDCT_{VP3,H264,CAVS,BINK,EA,WMV2} under FF_API_IDCT.
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/options_table.h')
| -rw-r--r-- | libavcodec/options_table.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 2a31fa64cc..764b5b1d88 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -214,8 +214,10 @@ static const AVOption options[]={ {"simplearmv6", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEARMV6 }, INT_MIN, INT_MAX, V|E|D, "idct"}, {"simpleneon", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLENEON }, INT_MIN, INT_MAX, V|E|D, "idct"}, {"simplealpha", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEALPHA }, INT_MIN, INT_MAX, V|E|D, "idct"}, +#if FF_API_IDCT {"h264", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_H264 }, INT_MIN, INT_MAX, V|E|D, "idct"}, {"vp3", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_VP3 }, INT_MIN, INT_MAX, V|E|D, "idct"}, +#endif {"ipp", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_IPP }, INT_MIN, INT_MAX, V|E|D, "idct"}, {"xvidmmx", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_XVIDMMX }, 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"}, |