From: "Ronald S. Bultje" <rsbul...@gmail.com>
The value is never used, except for bfin architectures to assign a
vp3-specific IDCT to DSPContext->idct, which makes no sense at all,
since the vp3 idct is located in VP3DSPContext.
Someone with access to bfin might want to fix up bfin/ to do the
correct thing.
---
libavcodec/avcodec.h | 1 -
libavcodec/bfin/dsputil_bfin.c | 2 +-
libavcodec/options_table.h | 1 -
3 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 8326bad..e7ae195 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -2681,7 +2681,6 @@ typedef struct AVCodecContext {
#define FF_IDCT_SH4 9
#define FF_IDCT_SIMPLEARM 10
#define FF_IDCT_H264 11
-#define FF_IDCT_VP3 12
#define FF_IDCT_IPP 13
#define FF_IDCT_XVIDMMX 14
#define FF_IDCT_CAVS 15
diff --git a/libavcodec/bfin/dsputil_bfin.c b/libavcodec/bfin/dsputil_bfin.c
index 8597ec1..e88d9fc 100644
--- a/libavcodec/bfin/dsputil_bfin.c
+++ b/libavcodec/bfin/dsputil_bfin.c
@@ -257,7 +257,7 @@ void ff_dsputil_init_bfin( DSPContext* c, AVCodecContext
*avctx )
if (avctx->dct_algo == FF_DCT_AUTO)
c->fdct = ff_bfin_fdct;
- if (avctx->idct_algo == FF_IDCT_VP3) {
+ if (0) { //avctx->idct_algo == FF_IDCT_VP3) {
c->idct_permutation_type = FF_NO_IDCT_PERM;
c->idct = ff_bfin_vp3_idct;
c->idct_add = ff_bfin_vp3_idct_add;
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index b58f847..2678247 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -208,7 +208,6 @@ static const AVOption options[]={
{"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"},
{"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"},
{"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"},
--
1.7.11.3
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
