diff options
| author | Mans Rullgard <mans@mansr.com> | 2011-07-09 11:38:39 +0100 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2011-07-10 17:55:58 +0100 |
| commit | 710b8df949248b29446e5ee8b081b611a83951fa (patch) | |
| tree | 722d5343b154cd0b76a0dc1b7f1b357ff8f11f52 | |
| parent | 0f6fc8660e32a69c406cba44cf31df6f7a7543d2 (diff) | |
| download | ffmpeg-710b8df949248b29446e5ee8b081b611a83951fa.tar.gz | |
dsputil: remove ff_emulated_edge_mc macro used in one place
This macro can cause problems in conjunction with the bitdepth
template expansion. It was presumably added to keep source
compatibility when high bitdepth support was added. However,
emulated_edge_mc is a dsputil pointer and should not be called
directly, so there is little reason to keep such a macro.
Signed-off-by: Mans Rullgard <mans@mansr.com>
| -rw-r--r-- | libavcodec/dsputil.h | 2 | ||||
| -rw-r--r-- | libavcodec/x86/dsputil_mmx.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index ef2956eecb..5a97b442ad 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -211,8 +211,6 @@ EMULATED_EDGE(8) EMULATED_EDGE(9) EMULATED_EDGE(10) -#define ff_emulated_edge_mc ff_emulated_edge_mc_8 - void ff_add_pixels_clamped_c(const DCTELEM *block, uint8_t *dest, int linesize); void ff_put_pixels_clamped_c(const DCTELEM *block, uint8_t *dest, int linesize); void ff_put_signed_pixels_clamped_c(const DCTELEM *block, uint8_t *dest, int linesize); diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c index b06a34ddce..4e84f63378 100644 --- a/libavcodec/x86/dsputil_mmx.c +++ b/libavcodec/x86/dsputil_mmx.c @@ -1879,7 +1879,7 @@ static void gmc_mmx(uint8_t *dst, uint8_t *src, int stride, int h, int ox, int o int dxx, int dxy, int dyx, int dyy, int shift, int r, int width, int height) { gmc(dst, src, stride, h, ox, oy, dxx, dxy, dyx, dyy, shift, r, - width, height, &ff_emulated_edge_mc); + width, height, &ff_emulated_edge_mc_8); } #endif |