diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-11 12:15:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-11 12:15:54 +0100 |
| commit | c3a62d3507b231f4ac8cb17eb537024b8c497bc9 (patch) | |
| tree | dfae224cba2ced8b0e3b951a83806bdeb0e268c9 /libavcodec/sparc | |
| parent | 5d7009dac28bd448313e3d04327b2cb00446dc83 (diff) | |
| parent | d46d87d1d3de41758b08c045d4b20f4b16ad21de (diff) | |
| download | ffmpeg-c3a62d3507b231f4ac8cb17eb537024b8c497bc9.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
sparc: dsputil_vis: Fix silly variable name search and replace typo
Conflicts:
libavcodec/sparc/dsputil_vis.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sparc')
| -rw-r--r-- | libavcodec/sparc/dsputil_vis.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/sparc/dsputil_vis.c b/libavcodec/sparc/dsputil_vis.c index f1cb43a159..93b53773dc 100644 --- a/libavcodec/sparc/dsputil_vis.c +++ b/libavcodec/sparc/dsputil_vis.c @@ -2062,7 +2062,7 @@ static void MC_put_no_round_o_16_vis (uint8_t * dest, const uint8_t * ref, } static void MC_put_no_round_o_8_vis (uint8_t * dest, const uint8_t * ref, - const ptrdiff_t stride, int height) + const ptrdiff_t stride, int height) { ref = vis_alignaddr(ref); do { /* 4 cycles */ @@ -2081,7 +2081,7 @@ static void MC_put_no_round_o_8_vis (uint8_t * dest, const uint8_t * ref, static void MC_avg_no_round_o_16_vis (uint8_t * dest, const uint8_t * ref, - const ptrdiff_t stride, int height) + const ptrdiff_t stride, int height) { int stride_8 = stride + 8; @@ -2241,7 +2241,7 @@ static void MC_avg_no_round_o_16_vis (uint8_t * dest, const uint8_t * ref, } static void MC_put_no_round_x_16_vis (uint8_t * dest, const uint8_t * ref, - const ptrdiff_t stride, int height) + const ptrdiff_t stride, int height) { unsigned long off = (unsigned long) ref & 0x7; unsigned long off_plus_1 = off + 1; @@ -2433,7 +2433,7 @@ static void MC_put_no_round_x_16_vis (uint8_t * dest, const uint8_t * ref, } static void MC_put_no_round_x_8_vis (uint8_t * dest, const uint8_t * ref, - const ptrdiff_t stride, int height) + const ptrdiff_t stride, int height) { unsigned long off = (unsigned long) ref & 0x7; unsigned long off_plus_1 = off + 1; @@ -2556,7 +2556,7 @@ static void MC_put_no_round_x_8_vis (uint8_t * dest, const uint8_t * ref, } static void MC_avg_no_round_x_16_vis (uint8_t * dest, const uint8_t * ref, - const ptrdiff_t stride, int height) + const ptrdiff_t stride, int height) { unsigned long off = (unsigned long) ref & 0x7; unsigned long off_plus_1 = off + 1; @@ -2646,7 +2646,7 @@ static void MC_avg_no_round_x_16_vis (uint8_t * dest, const uint8_t * ref, } static void MC_put_no_round_y_16_vis (uint8_t * dest, const uint8_t * ref, - const ptrdiff_t stride, int height) + const ptrdiff_t stride, int height) { ref = vis_alignaddr(ref); vis_ld64(ref[0], TMP0); @@ -2800,7 +2800,7 @@ static void MC_put_no_round_y_16_vis (uint8_t * dest, const uint8_t * ref, } static void MC_put_no_round_y_8_vis (uint8_t * dest, const uint8_t * ref, - const ptrdiff_t stride, int height) + const ptrdiff_t stride, int height) { ref = vis_alignaddr(ref); vis_ld64(ref[0], TMP0); @@ -2890,7 +2890,7 @@ static void MC_put_no_round_y_8_vis (uint8_t * dest, const uint8_t * ref, } static void MC_avg_no_round_y_16_vis (uint8_t * dest, const uint8_t * ref, - const ptrdiff_t stride, int height) + const ptrdiff_t stride, int height) { int stride_8 = stride + 8; int stride_16 = stride + 16; |