diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-07 15:54:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-07 16:17:27 +0200 |
| commit | 3790801f9cedfae81cb8f055bbb0b14131459658 (patch) | |
| tree | 4fb4e35103252ce0a7cecf1d01041db506078894 /libavcodec/x86/dsputil_init.c | |
| parent | 020865f557ccf06a41ecc461fd13ce6678817d04 (diff) | |
| parent | 3c650efb81aaa3b395ba4606ee68a47ee4efb57b (diff) | |
| download | ffmpeg-3790801f9cedfae81cb8f055bbb0b14131459658.tar.gz | |
Merge commit '3c650efb81aaa3b395ba4606ee68a47ee4efb57b'
* commit '3c650efb81aaa3b395ba4606ee68a47ee4efb57b':
dsputil: Move draw_edges() to mpegvideoencdsp
Conflicts:
libavcodec/mpegvideo_enc.c
libavcodec/x86/Makefile
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_x86.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/dsputil_init.c')
| -rw-r--r-- | libavcodec/x86/dsputil_init.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/libavcodec/x86/dsputil_init.c b/libavcodec/x86/dsputil_init.c index c1b110b68d..85c637b620 100644 --- a/libavcodec/x86/dsputil_init.c +++ b/libavcodec/x86/dsputil_init.c @@ -27,25 +27,9 @@ #include "libavcodec/dsputil.h" #include "dsputil_x86.h" -static av_cold void dsputil_init_mmx(DSPContext *c, AVCodecContext *avctx, - int cpu_flags, unsigned high_bit_depth) -{ -#if HAVE_MMX_INLINE - if (!high_bit_depth) { - c->draw_edges = ff_draw_edges_mmx; - } - -#endif /* HAVE_MMX_INLINE */ -} - av_cold void ff_dsputil_init_x86(DSPContext *c, AVCodecContext *avctx, unsigned high_bit_depth) { - int cpu_flags = av_get_cpu_flags(); - - if (X86_MMX(cpu_flags)) - dsputil_init_mmx(c, avctx, cpu_flags, high_bit_depth); - if (CONFIG_ENCODERS) ff_dsputilenc_init_mmx(c, avctx, high_bit_depth); } |