diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-27 01:40:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-27 01:40:18 +0100 |
| commit | 3c8493074bc43aced247a34d6b981e6f9acde0f1 (patch) | |
| tree | 99b7984ed8e49d397c4cb3dab184454e26e122f1 /libavcodec/x86 | |
| parent | b0efaee6c1a07b4e7575bf523542ce846202b6e2 (diff) | |
| parent | 1500be13f204acb7e74dac4325ef0052576fa2a9 (diff) | |
| download | ffmpeg-3c8493074bc43aced247a34d6b981e6f9acde0f1.tar.gz | |
Merge remote-tracking branch 'newdev/master'
* newdev/master:
dsputil: allow to skip drawing of top/bottom edges.
Split fate-psx-str-v3 into a video-only and audio-only test.
Conflicts:
libavcodec/dsputil.c
libavcodec/mpegvideo.c
libavcodec/snow.c
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86')
| -rw-r--r-- | libavcodec/x86/dsputil_mmx.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c index c163a16848..d06ad6309d 100644 --- a/libavcodec/x86/dsputil_mmx.c +++ b/libavcodec/x86/dsputil_mmx.c @@ -836,9 +836,9 @@ static void draw_edges_mmx(uint8_t *buf, int wrap, int width, int height, int w, ); } - for(i=0;i<w;i+=4) { - /* top and bottom (and hopefully also the corners) */ - if (sides&EDGE_TOP) { + /* top and bottom (and hopefully also the corners) */ + if (sides&EDGE_TOP) { + for(i = 0; i < w; i += 4) { ptr= buf - (i + 1) * wrap - w; __asm__ volatile( "1: \n\t" @@ -854,8 +854,10 @@ static void draw_edges_mmx(uint8_t *buf, int wrap, int width, int height, int w, : "r" ((x86_reg)buf - (x86_reg)ptr - w), "r" ((x86_reg)-wrap), "r" ((x86_reg)-wrap*3), "r" (ptr+width+2*w) ); } + } - if (sides&EDGE_BOTTOM) { + if (sides&EDGE_BOTTOM) { + for(i = 0; i < w; i += 4) { ptr= last_line + (i + 1) * wrap - w; __asm__ volatile( "1: \n\t" |