virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer 2013-02-11 12:15:54 +01:00
commit c3a62d3507
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/sparc/dsputil_vis.c
View File

@ -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;