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_internal.h | |
| 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/swscale_internal.h')
| -rw-r--r-- | libswscale/swscale_internal.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index 241c66b9c4..33fdfc2771 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -274,7 +274,7 @@ typedef struct SwsContext { * Note that src, dst, srcStride, dstStride will be copied in the * sws_scale() wrapper so they can be freely modified here. */ - SwsFunc swScale; + SwsFunc swscale; int srcW; ///< Width of source luma/alpha planes. int srcH; ///< Height of source luma/alpha planes. int dstH; ///< Height of destination luma/alpha planes. @@ -497,7 +497,7 @@ typedef struct SwsContext { int16_t xyz2rgb_matrix[3][4]; int16_t rgb2xyz_matrix[3][4]; - /* function pointers for swScale() */ + /* function pointers for swscale() */ yuv2planar1_fn yuv2plane1; yuv2planarX_fn yuv2planeX; yuv2interleavedX_fn yuv2nv12cX; @@ -827,7 +827,7 @@ extern const int32_t ff_yuv2rgb_coeffs[8][4]; extern const AVClass sws_context_class; /** - * Set c->swScale to an unscaled converter if one exists for the specific + * Set c->swscale to an unscaled converter if one exists for the specific * source and destination formats, bit depths, flags, etc. */ void ff_get_unscaled_swscale(SwsContext *c); |