diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-03 10:43:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-03 10:44:09 +0200 |
| commit | 35ef98013dfc8b9c4c4c3d6e87ff235b02cf71bc (patch) | |
| tree | a0c578da7bbaf308a6682a70298873fabd19bb24 /libavcodec/x86/dsputil_mmx.c | |
| parent | ed1697ffcb43dce84567f390f921ff26f5ec11a4 (diff) | |
| parent | 932806232108872655556100011fe369125805d3 (diff) | |
| download | ffmpeg-35ef98013dfc8b9c4c4c3d6e87ff235b02cf71bc.tar.gz | |
Merge commit '932806232108872655556100011fe369125805d3'
* commit '932806232108872655556100011fe369125805d3':
x86: dsputil: Move avg_pixels16_mmx() out of rnd_template.c
x86: dsputil: Move avg_pixels8_mmx() out of rnd_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/dsputil_mmx.c')
| -rw-r--r-- | libavcodec/x86/dsputil_mmx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c index 77d79eaedb..10fb43d9d0 100644 --- a/libavcodec/x86/dsputil_mmx.c +++ b/libavcodec/x86/dsputil_mmx.c @@ -1086,7 +1086,7 @@ void ff_put_cavs_qpel8_mc00_mmx(uint8_t *dst, uint8_t *src, ptrdiff_t stride) void ff_avg_cavs_qpel8_mc00_mmx(uint8_t *dst, uint8_t *src, ptrdiff_t stride) { - avg_pixels8_mmx(dst, src, stride, 8); + ff_avg_pixels8_mmx(dst, src, stride, 8); } void ff_put_cavs_qpel16_mc00_mmx(uint8_t *dst, uint8_t *src, ptrdiff_t stride) @@ -1096,7 +1096,7 @@ void ff_put_cavs_qpel16_mc00_mmx(uint8_t *dst, uint8_t *src, ptrdiff_t stride) void ff_avg_cavs_qpel16_mc00_mmx(uint8_t *dst, uint8_t *src, ptrdiff_t stride) { - avg_pixels16_mmx(dst, src, stride, 16); + ff_avg_pixels16_mmx(dst, src, stride, 16); } /* VC-1-specific */ @@ -1134,7 +1134,7 @@ void ff_ ## OPNAME2 ## _dirac_pixels32_ ## EXT(uint8_t *dst, const uint8_t *src[ #if HAVE_MMX_INLINE DIRAC_PIXOP(put, ff_put, mmx) -DIRAC_PIXOP(avg, avg, mmx) +DIRAC_PIXOP(avg, ff_avg, mmx) #endif #if HAVE_YASM |