diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-23 15:04:19 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-23 15:05:12 -0300 |
| commit | c381f6a483e00ab8bfa4f777284b89acdad6dd94 (patch) | |
| tree | 4ee201d57d46594c02093659d9173039eb12c3a0 /libavcodec/options_table.h | |
| parent | b13e61d6296e4f91f1f495ff436c61ad5de323fb (diff) | |
| parent | 0871e2337777d9161e7f3554bcad19dabc9e15e1 (diff) | |
| download | ffmpeg-streaming-c381f6a483e00ab8bfa4f777284b89acdad6dd94.zip ffmpeg-streaming-c381f6a483e00ab8bfa4f777284b89acdad6dd94.tar.gz | |
Merge commit '0871e2337777d9161e7f3554bcad19dabc9e15e1'
* commit '0871e2337777d9161e7f3554bcad19dabc9e15e1':
lavc: Drop deprecated architectures symbols
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/options_table.h')
| -rw-r--r-- | libavcodec/options_table.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 7a3e765..c40b3e6 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -219,16 +219,10 @@ static const AVOption avcodec_options[] = { {"simplemmx", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEMMX }, INT_MIN, INT_MAX, V|E|D, "idct"}, {"arm", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_ARM }, INT_MIN, INT_MAX, V|E|D, "idct"}, {"altivec", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_ALTIVEC }, INT_MIN, INT_MAX, V|E|D, "idct"}, -#if FF_API_ARCH_SH4 -{"sh4", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SH4 }, INT_MIN, INT_MAX, V|E|D, "idct"}, -#endif {"simplearm", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEARM }, INT_MIN, INT_MAX, V|E|D, "idct"}, {"simplearmv5te", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEARMV5TE }, INT_MIN, INT_MAX, V|E|D, "idct"}, {"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"}, -#if FF_API_ARCH_ALPHA -{"simplealpha", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEALPHA }, INT_MIN, INT_MAX, V|E|D, "idct"}, -#endif #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 */ |
