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/swscale.c | |
| parent | c49b6c3d999c65cbd336a1984306d0c66aa9d2d1 (diff) | |
| parent | 1909f6b1b6da2db371c179bed5a19aaf979b7557 (diff) | |
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/swscale.c')
| -rw-r--r-- | libswscale/swscale.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 7037c5b541..710dce3330 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -331,7 +331,7 @@ static av_always_inline void hcscale(SwsContext *c, int16_t *dst1, if (DEBUG_SWSCALE_BUFFERS) \ av_log(c, AV_LOG_DEBUG, __VA_ARGS__) -static int swScale(SwsContext *c, const uint8_t *src[], +static int swscale(SwsContext *c, const uint8_t *src[], int srcStride[], int srcSliceY, int srcSliceH, uint8_t *dst[], int dstStride[]) { @@ -403,7 +403,7 @@ static int swScale(SwsContext *c, const uint8_t *src[], srcStride[1] <<= c->vChrDrop; srcStride[2] <<= c->vChrDrop; - DEBUG_BUFFERS("swScale() %p[%d] %p[%d] %p[%d] %p[%d] -> %p[%d] %p[%d] %p[%d] %p[%d]\n", + DEBUG_BUFFERS("swscale() %p[%d] %p[%d] %p[%d] %p[%d] -> %p[%d] %p[%d] %p[%d] %p[%d]\n", src[0], srcStride[0], src[1], srcStride[1], src[2], srcStride[2], src[3], srcStride[3], dst[0], dstStride[0], dst[1], dstStride[1], @@ -704,7 +704,7 @@ static int swScale(SwsContext *c, const uint8_t *src[], return dstY - lastDstY; } -static av_cold void sws_init_swScale_c(SwsContext *c) +static av_cold void sws_init_swscale(SwsContext *c) { enum AVPixelFormat srcFormat = c->srcFormat; @@ -757,14 +757,14 @@ static av_cold void sws_init_swScale_c(SwsContext *c) SwsFunc ff_getSwsFunc(SwsContext *c) { - sws_init_swScale_c(c); + sws_init_swscale(c); if (ARCH_PPC) ff_sws_init_swscale_ppc(c); if (ARCH_X86) ff_sws_init_swscale_x86(c); - return swScale; + return swscale; } static void reset_ptr(const uint8_t *src[], int format) @@ -1072,7 +1072,7 @@ int attribute_align_arg sws_scale(struct SwsContext *c, if (srcSliceY + srcSliceH == c->srcH) c->sliceDir = 0; - ret = c->swScale(c, src2, srcStride2, srcSliceY, srcSliceH, dst2, + ret = c->swscale(c, src2, srcStride2, srcSliceY, srcSliceH, dst2, dstStride2); } else { // slices go from bottom to top => we flip the image internally @@ -1098,7 +1098,7 @@ int attribute_align_arg sws_scale(struct SwsContext *c, if (!srcSliceY) c->sliceDir = 0; - ret = c->swScale(c, src2, srcStride2, c->srcH-srcSliceY-srcSliceH, + ret = c->swscale(c, src2, srcStride2, c->srcH-srcSliceY-srcSliceH, srcSliceH, dst2, dstStride2); } |