diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 22:26:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 22:29:30 +0200 |
| commit | 43bf4ee9a9740bb8e223f9a8d449ec76a139dc44 (patch) | |
| tree | d8c68ce97192c01801520f7a220ad415a7d8b359 /libavcodec | |
| parent | 52bda1d903954c353bdd718a034675ee78977561 (diff) | |
| parent | e027032fc6a49db5a4ce12fc3e09ffb86ff20522 (diff) | |
| download | ffmpeg-43bf4ee9a9740bb8e223f9a8d449ec76a139dc44.tar.gz | |
Merge commit 'e027032fc6a49db5a4ce12fc3e09ffb86ff20522'
* commit 'e027032fc6a49db5a4ce12fc3e09ffb86ff20522':
x86: dsputil: ff_h263_*_loop_filter declarations to a more suitable place
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/x86/dsputil_mmx.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c index 58429c4e66..2a3ddb8467 100644 --- a/libavcodec/x86/dsputil_mmx.c +++ b/libavcodec/x86/dsputil_mmx.c @@ -526,12 +526,7 @@ static void add_hfyu_median_prediction_cmov(uint8_t *dst, const uint8_t *top, *left_top = tl; } #endif -#endif /* HAVE_INLINE_ASM */ - -void ff_h263_v_loop_filter_mmx(uint8_t *src, int stride, int qscale); -void ff_h263_h_loop_filter_mmx(uint8_t *src, int stride, int qscale); -#if HAVE_INLINE_ASM /* Draw the edges of width 'w' of an image of size width, height * this MMX version can only handle w == 8 || w == 16. */ static void draw_edges_mmx(uint8_t *buf, int wrap, int width, int height, @@ -1359,6 +1354,9 @@ static void vector_clipf_sse(float *dst, const float *src, #endif /* HAVE_INLINE_ASM */ +void ff_h263_v_loop_filter_mmx(uint8_t *src, int stride, int qscale); +void ff_h263_h_loop_filter_mmx(uint8_t *src, int stride, int qscale); + int32_t ff_scalarproduct_int16_mmxext(const int16_t *v1, const int16_t *v2, int order); int32_t ff_scalarproduct_int16_sse2(const int16_t *v1, const int16_t *v2, |