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/h264_qpel.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/h264_qpel.c')
-rw-r--r-- | libavcodec/x86/h264_qpel.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/x86/h264_qpel.c b/libavcodec/x86/h264_qpel.c index a467878918..c1e7fb7269 100644 --- a/libavcodec/x86/h264_qpel.c +++ b/libavcodec/x86/h264_qpel.c @@ -31,7 +31,6 @@ void ff_put_pixels4_mmxext(uint8_t *block, const uint8_t *pixels, int line_size, int h); void ff_avg_pixels4_mmxext(uint8_t *block, const uint8_t *pixels, int line_size, int h); void ff_put_pixels8_mmxext(uint8_t *block, const uint8_t *pixels, int line_size, int h); -void ff_avg_pixels8_mmxext(uint8_t *block, const uint8_t *pixels, int line_size, int h); static void ff_put_pixels16_mmxext(uint8_t *block, const uint8_t *pixels, int line_size, int h) { |