diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 12:03:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 12:03:22 +0100 |
| commit | b13cd2d86763cddd754bab204b0893d7bf7e123b (patch) | |
| tree | 0474a2e55908ee79275f9061887f2a8b8521688f /libavcodec/options_table.h | |
| parent | feccf2f6b747e433766464e8a8b215cbe70c5f27 (diff) | |
| parent | d6ed604cf4ca86ed345125b26eb5bdeea6d6bf68 (diff) | |
Merge commit 'd6ed604cf4ca86ed345125b26eb5bdeea6d6bf68'
* commit 'd6ed604cf4ca86ed345125b26eb5bdeea6d6bf68':
lavc: remove disabled FF_API_IDCT cruft
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 | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 42c0ad0ee9..d7e2683039 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -197,10 +197,6 @@ 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"}, |