diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-27 11:59:25 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-27 11:59:31 +0100 |
commit | 04ec796bda7919058d6a75cf11b9a387a207375a (patch) | |
tree | 3af6ae3c211098a5b2ba2bc2d21bbf42f441d6a8 /libavcodec/x86/dsputil_mmx.c | |
parent | f2bbc2ffc33871bc2901f94dbfaae60497a9f7c5 (diff) | |
parent | 096cc11ec102701a18951b4f0437d609081ca1dd (diff) | |
download | ffmpeg-04ec796bda7919058d6a75cf11b9a387a207375a.tar.gz |
Merge commit '096cc11ec102701a18951b4f0437d609081ca1dd'
* commit '096cc11ec102701a18951b4f0437d609081ca1dd':
x86: vc1dsp: Move ff_avg_vc1_mspel_mc00_mmxext out of dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/dsputil_mmx.c')
-rw-r--r-- | libavcodec/x86/dsputil_mmx.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c index e331858090..231e0c53d1 100644 --- a/libavcodec/x86/dsputil_mmx.c +++ b/libavcodec/x86/dsputil_mmx.c @@ -130,8 +130,6 @@ void ff_put_no_rnd_pixels8_y2_exact_mmxext(uint8_t *block, void ff_put_no_rnd_pixels8_y2_exact_3dnow(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h); -void ff_avg_pixels8_mmxext(uint8_t *block, const uint8_t *pixels, - ptrdiff_t line_size, int h); void ff_avg_pixels8_3dnow(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h); void ff_avg_pixels8_x2_mmxext(uint8_t *block, const uint8_t *pixels, @@ -1382,12 +1380,6 @@ void ff_put_vc1_mspel_mc00_mmx(uint8_t *dst, const uint8_t *src, { ff_put_pixels8_mmx(dst, src, stride, 8); } - -void ff_avg_vc1_mspel_mc00_mmxext(uint8_t *dst, const uint8_t *src, - int stride, int rnd) -{ - ff_avg_pixels8_mmxext(dst, src, stride, 8); -} #endif /* HAVE_YASM */ #if CONFIG_DIRAC_DECODER |