diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 15:54:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 15:56:03 +0200 |
| commit | 01cac26f6848a809aba3f08e45d8c339702d90a9 (patch) | |
| tree | 2fd72b6a166536bb9489755b2d8f1eae03fbceae /libswscale/ppc | |
| parent | c49b6c3d999c65cbd336a1984306d0c66aa9d2d1 (diff) | |
| parent | 1909f6b1b6da2db371c179bed5a19aaf979b7557 (diff) | |
| download | ffmpeg-01cac26f6848a809aba3f08e45d8c339702d90a9.tar.gz | |
Merge commit '1909f6b1b6da2db371c179bed5a19aaf979b7557'
* commit '1909f6b1b6da2db371c179bed5a19aaf979b7557':
swscale: cosmetics: Drop silly camelCase from swScale function pointer name
Conflicts:
libswscale/swscale_unscaled.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/ppc')
| -rw-r--r-- | libswscale/ppc/yuv2yuv_altivec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libswscale/ppc/yuv2yuv_altivec.c b/libswscale/ppc/yuv2yuv_altivec.c index 0ef172d7fd..64bd79cdfc 100644 --- a/libswscale/ppc/yuv2yuv_altivec.c +++ b/libswscale/ppc/yuv2yuv_altivec.c @@ -193,9 +193,9 @@ av_cold void ff_get_unscaled_swscale_ppc(SwsContext *c) // unscaled YV12 -> packed YUV, we want speed if (dstFormat == AV_PIX_FMT_YUYV422) - c->swScale = yv12toyuy2_unscaled_altivec; + c->swscale = yv12toyuy2_unscaled_altivec; else if (dstFormat == AV_PIX_FMT_UYVY422) - c->swScale = yv12touyvy_unscaled_altivec; + c->swscale = yv12touyvy_unscaled_altivec; } #endif /* HAVE_ALTIVEC */ } |