[FFmpeg-cvslog] avcodec: remove deprecated use of FF_IDCT_XVIDMMX
Michael Niedermayer
git at videolan.org
Sun Aug 10 00:49:10 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Aug 9 22:39:44 2014 +0200| [889cb3ae2375d9cd7c3174fe47fecacc2eb57787] | committer: Michael Niedermayer
avcodec: remove deprecated use of FF_IDCT_XVIDMMX
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit eedc3f36532e4c6de782fe1c2dc59d192418a8fc)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=889cb3ae2375d9cd7c3174fe47fecacc2eb57787
---
libavcodec/idctdsp.c | 2 +-
libavcodec/mpeg4videodec.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/idctdsp.c b/libavcodec/idctdsp.c
index 6e238bb..94bad73 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 f5eec3f..021f2c5 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;
}
More information about the ffmpeg-cvslog
mailing list