diff options
author | Diego Biurrun <diego@biurrun.de> | 2014-01-14 10:33:47 +0100 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2014-06-18 14:07:23 -0700 |
commit | e74433a8e6fc00c8dbde293c97a3e45384c2c1d9 (patch) | |
tree | f975b37a58a7c6e62c84c12349610ce6f40ad4d1 /libavcodec/x86/dsputil_init.c | |
parent | 869fc416f7c78ed4e397e0208acd1545771c0502 (diff) | |
download | ffmpeg-e74433a8e6fc00c8dbde293c97a3e45384c2c1d9.tar.gz |
dsputil: Split clear_block*/fill_block* off into a separate context
Diffstat (limited to 'libavcodec/x86/dsputil_init.c')
-rw-r--r-- | libavcodec/x86/dsputil_init.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/libavcodec/x86/dsputil_init.c b/libavcodec/x86/dsputil_init.c index 389e7634dd..a19b83d83c 100644 --- a/libavcodec/x86/dsputil_init.c +++ b/libavcodec/x86/dsputil_init.c @@ -19,12 +19,10 @@ #include "config.h" #include "libavutil/attributes.h" #include "libavutil/cpu.h" -#include "libavutil/internal.h" #include "libavutil/x86/cpu.h" #include "libavcodec/avcodec.h" #include "libavcodec/dsputil.h" #include "libavcodec/simple_idct.h" -#include "libavcodec/version.h" #include "dsputil_x86.h" #include "idct_xvid.h" @@ -54,8 +52,6 @@ static av_cold void dsputil_init_mmx(DSPContext *c, AVCodecContext *avctx, c->add_pixels_clamped = ff_add_pixels_clamped_mmx; if (!high_bit_depth) { - c->clear_block = ff_clear_block_mmx; - c->clear_blocks = ff_clear_blocks_mmx; c->draw_edges = ff_draw_edges_mmx; switch (avctx->idct_algo) { @@ -103,19 +99,6 @@ static av_cold void dsputil_init_sse(DSPContext *c, AVCodecContext *avctx, { #if HAVE_SSE_INLINE c->vector_clipf = ff_vector_clipf_sse; - -#if FF_API_XVMC -FF_DISABLE_DEPRECATION_WARNINGS - /* XvMCCreateBlocks() may not allocate 16-byte aligned blocks */ - if (CONFIG_MPEG_XVMC_DECODER && avctx->xvmc_acceleration > 1) - return; -FF_ENABLE_DEPRECATION_WARNINGS -#endif /* FF_API_XVMC */ - - if (!high_bit_depth) { - c->clear_block = ff_clear_block_sse; - c->clear_blocks = ff_clear_blocks_sse; - } #endif /* HAVE_SSE_INLINE */ } |