diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-09 22:39:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-09 22:45:57 +0200 |
| commit | 889cb3ae2375d9cd7c3174fe47fecacc2eb57787 (patch) | |
| tree | 0ea898305bfa10e3bb7c5af3786fb86044d5b403 | |
| parent | 3e41d2e612215e2ee9f436e3ad3bd8440b6ddfb4 (diff) | |
| download | ffmpeg-889cb3ae2375d9cd7c3174fe47fecacc2eb57787.tar.gz | |
avcodec: remove deprecated use of FF_IDCT_XVIDMMX
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit eedc3f36532e4c6de782fe1c2dc59d192418a8fc)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/idctdsp.c | 2 | ||||
| -rw-r--r-- | libavcodec/mpeg4videodec.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/idctdsp.c b/libavcodec/idctdsp.c index 6e238bbca5..94bad73cf3 100644 --- a/libavcodec/idctdsp.c +++ b/libavcodec/idctdsp.c @@ -300,7 +300,7 @@ av_cold void ff_idctdsp_init(IDCTDSPContext *c, AVCodecContext *avctx) c->put_signed_pixels_clamped = put_signed_pixels_clamped_c; c->add_pixels_clamped = add_pixels_clamped_c; - if (CONFIG_MPEG4_DECODER && avctx->idct_algo == FF_IDCT_XVIDMMX) + if (CONFIG_MPEG4_DECODER && avctx->idct_algo == FF_IDCT_XVID) ff_xvididct_init(c, avctx); if (ARCH_ALPHA) diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index f5eec3f2d1..021f2c5ac6 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -2214,7 +2214,7 @@ int ff_mpeg4_workaround_bugs(AVCodecContext *avctx) s->codec_id == AV_CODEC_ID_MPEG4 && avctx->idct_algo == FF_IDCT_AUTO && (av_get_cpu_flags() & AV_CPU_FLAG_MMX)) { - avctx->idct_algo = FF_IDCT_XVIDMMX; + avctx->idct_algo = FF_IDCT_XVID; ff_dct_common_init(s); return 1; } |