mirror of https://git.ffmpeg.org/ffmpeg.git
lavc: Drop deprecated architectures symbols
Alpha deprecated in 11/2013. Sh4 and sparc deprecated in 01/2014.
This commit is contained in:
parent
c06e739291
commit
0871e23377
|
@ -2734,9 +2734,6 @@ typedef struct AVCodecContext {
|
||||||
#define FF_IDCT_SIMPLEMMX 3
|
#define FF_IDCT_SIMPLEMMX 3
|
||||||
#define FF_IDCT_ARM 7
|
#define FF_IDCT_ARM 7
|
||||||
#define FF_IDCT_ALTIVEC 8
|
#define FF_IDCT_ALTIVEC 8
|
||||||
#if FF_API_ARCH_SH4
|
|
||||||
#define FF_IDCT_SH4 9
|
|
||||||
#endif
|
|
||||||
#define FF_IDCT_SIMPLEARM 10
|
#define FF_IDCT_SIMPLEARM 10
|
||||||
#if FF_API_UNUSED_MEMBERS
|
#if FF_API_UNUSED_MEMBERS
|
||||||
#define FF_IDCT_IPP 13
|
#define FF_IDCT_IPP 13
|
||||||
|
@ -2747,14 +2744,8 @@ typedef struct AVCodecContext {
|
||||||
#endif /* FF_API_IDCT_XVIDMMX */
|
#endif /* FF_API_IDCT_XVIDMMX */
|
||||||
#define FF_IDCT_SIMPLEARMV5TE 16
|
#define FF_IDCT_SIMPLEARMV5TE 16
|
||||||
#define FF_IDCT_SIMPLEARMV6 17
|
#define FF_IDCT_SIMPLEARMV6 17
|
||||||
#if FF_API_ARCH_SPARC
|
|
||||||
#define FF_IDCT_SIMPLEVIS 18
|
|
||||||
#endif
|
|
||||||
#define FF_IDCT_FAAN 20
|
#define FF_IDCT_FAAN 20
|
||||||
#define FF_IDCT_SIMPLENEON 22
|
#define FF_IDCT_SIMPLENEON 22
|
||||||
#if FF_API_ARCH_ALPHA
|
|
||||||
#define FF_IDCT_SIMPLEALPHA 23
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* bits per sample/pixel from the demuxer (needed for huffyuv).
|
* bits per sample/pixel from the demuxer (needed for huffyuv).
|
||||||
|
|
|
@ -205,16 +205,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"},
|
{"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"},
|
{"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"},
|
{"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"},
|
{"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"},
|
{"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"},
|
{"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"},
|
{"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
|
#if FF_API_UNUSED_MEMBERS
|
||||||
{"ipp", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_IPP }, INT_MIN, INT_MAX, V|E|D, "idct"},
|
{"ipp", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_IPP }, INT_MIN, INT_MAX, V|E|D, "idct"},
|
||||||
#endif /* FF_API_UNUSED_MEMBERS */
|
#endif /* FF_API_UNUSED_MEMBERS */
|
||||||
|
|
|
@ -47,9 +47,6 @@
|
||||||
* the public API and may change, break or disappear at any time.
|
* the public API and may change, break or disappear at any time.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef FF_API_ARCH_ALPHA
|
|
||||||
#define FF_API_ARCH_ALPHA (LIBAVCODEC_VERSION_MAJOR < 58)
|
|
||||||
#endif
|
|
||||||
#ifndef FF_API_XVMC
|
#ifndef FF_API_XVMC
|
||||||
#define FF_API_XVMC (LIBAVCODEC_VERSION_MAJOR < 58)
|
#define FF_API_XVMC (LIBAVCODEC_VERSION_MAJOR < 58)
|
||||||
#endif
|
#endif
|
||||||
|
@ -74,12 +71,6 @@
|
||||||
#ifndef FF_API_EMU_EDGE
|
#ifndef FF_API_EMU_EDGE
|
||||||
#define FF_API_EMU_EDGE (LIBAVCODEC_VERSION_MAJOR < 58)
|
#define FF_API_EMU_EDGE (LIBAVCODEC_VERSION_MAJOR < 58)
|
||||||
#endif
|
#endif
|
||||||
#ifndef FF_API_ARCH_SH4
|
|
||||||
#define FF_API_ARCH_SH4 (LIBAVCODEC_VERSION_MAJOR < 58)
|
|
||||||
#endif
|
|
||||||
#ifndef FF_API_ARCH_SPARC
|
|
||||||
#define FF_API_ARCH_SPARC (LIBAVCODEC_VERSION_MAJOR < 58)
|
|
||||||
#endif
|
|
||||||
#ifndef FF_API_UNUSED_MEMBERS
|
#ifndef FF_API_UNUSED_MEMBERS
|
||||||
#define FF_API_UNUSED_MEMBERS (LIBAVCODEC_VERSION_MAJOR < 58)
|
#define FF_API_UNUSED_MEMBERS (LIBAVCODEC_VERSION_MAJOR < 58)
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue