Mercurial > mplayer.hg
diff libswscale/utils.c @ 32315:549b1ad3f777
Deprecate sws_getContext(), use sws_alloc_context() and
sws_init_context() instead.
author | stefano |
---|---|
date | Tue, 28 Sep 2010 22:23:58 +0000 |
parents | ecb8e52d4add |
children | 6f41498718cd |
line wrap: on
line diff
--- a/libswscale/utils.c Tue Sep 28 22:23:53 2010 +0000 +++ b/libswscale/utils.c Tue Sep 28 22:23:58 2010 +0000 @@ -1146,6 +1146,7 @@ return -1; } +#if FF_API_SWS_GETCONTEXT SwsContext *sws_getContext(int srcW, int srcH, enum PixelFormat srcFormat, int dstW, int dstH, enum PixelFormat dstFormat, int flags, SwsFilter *srcFilter, SwsFilter *dstFilter, const double *param) @@ -1181,6 +1182,7 @@ return c; } +#endif SwsFilter *sws_getDefaultFilter(float lumaGBlur, float chromaGBlur, float lumaSharpen, float chromaSharpen, @@ -1564,9 +1566,19 @@ } if (!context) { - return sws_getContext(srcW, srcH, srcFormat, - dstW, dstH, dstFormat, flags, - srcFilter, dstFilter, param); + if (!(context = sws_alloc_context())) + return NULL; + context->srcW = srcW; + context->srcH = srcH; + context->srcFormat = srcFormat; + context->dstFormat = dstFormat; + context->flags = flags; + context->param[0] = param[0]; + context->param[1] = param[1]; + if (sws_init_context(context, srcFilter, dstFilter) < 0) { + sws_freeContext(context); + return NULL; + } } return context; }