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

[mstorsjo]

Author: mstorsjo
Date: Fri Oct 29 15:48:12 2010
New Revision: 32562

Log:
Store src/dstFormat after calling handle_jpeg

handle_jpeg may update the src/dstFormat variables, this makes sure the
updated version is stored in the context.

This fixes roundup issue 2302.

Patch by Troot, all_crap_goes_here at hotmail

Modified:
   trunk/libswscale/utils.c

Modified: trunk/libswscale/utils.c
==============================================================================
--- trunk/libswscale/utils.c	Thu Oct 28 10:12:26 2010	(r32561)
+++ trunk/libswscale/utils.c	Fri Oct 29 15:48:12 2010	(r32562)
@@ -1554,15 +1554,15 @@ struct SwsContext *sws_getCachedContext(
             return NULL;
         context->srcW      = srcW;
         context->srcH      = srcH;
+        context->srcRange  = handle_jpeg(&srcFormat);
         context->srcFormat = srcFormat;
         context->dstW      = dstW;
         context->dstH      = dstH;
+        context->dstRange  = handle_jpeg(&dstFormat);
         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);