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/utils.c | |
| 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/utils.c')
| -rw-r--r-- | libswscale/utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libswscale/utils.c b/libswscale/utils.c index fa3f38ee40..d1285c3e87 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -1292,7 +1292,7 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, (c->srcRange == c->dstRange || isAnyRGB(dstFormat))) { ff_get_unscaled_swscale(c); - if (c->swScale) { + if (c->swscale) { if (flags & SWS_PRINT_INFO) av_log(c, AV_LOG_INFO, "using unscaled %s -> %s special converter\n", @@ -1606,7 +1606,7 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, c->chrXInc, c->chrYInc); } - c->swScale = ff_getSwsFunc(c); + c->swscale = ff_getSwsFunc(c); return 0; fail: // FIXME replace things by appropriate error codes return -1; |