[FFmpeg-cvslog] r32424 - trunk/libswscale/utils.c

reimar subversion
Sun Oct 3 09:53:40 CEST 2010


Author: reimar
Date: Sun Oct  3 09:53:40 2010
New Revision: 32424

Log:
100l, fix sws_getCachedContext. It did not set the colorspace details,
but worse it did not set up destination dimensions, thus every user
of it would necessarily fail.

Modified:
   trunk/libswscale/utils.c

Modified: trunk/libswscale/utils.c
==============================================================================
--- trunk/libswscale/utils.c	Sat Oct  2 17:03:40 2010	(r32423)
+++ trunk/libswscale/utils.c	Sun Oct  3 09:53:40 2010	(r32424)
@@ -1555,10 +1555,15 @@ struct SwsContext *sws_getCachedContext(
         context->srcW      = srcW;
         context->srcH      = srcH;
         context->srcFormat = srcFormat;
+        context->dstW      = dstW;
+        context->dstH      = dstH;
         context->dstFormat = dstFormat;
         context->flags     = flags;
         context->param[0]  = param[0];
         context->param[1]  = param[1];
+        context->srcRange = handle_jpeg(&srcFormat);
+        context->dstRange = handle_jpeg(&dstFormat);
+        sws_setColorspaceDetails(context, ff_yuv2rgb_coeffs[SWS_CS_DEFAULT], context->srcRange, ff_yuv2rgb_coeffs[SWS_CS_DEFAULT] /* FIXME*/, context->dstRange, 0, 1<<16, 1<<16);
         if (sws_init_context(context, srcFilter, dstFilter) < 0) {
             sws_freeContext(context);
             return NULL;



More information about the ffmpeg-cvslog mailing list