Mercurial > mplayer.hg

changeset 32475:87d55484ceaa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author mstorsjo
date Fri, 29 Oct 2010 13:48:12 +0000
parents 6d06be50007f
children af9ef007bec6
files libswscale/utils.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libswscale/utils.c	Thu Oct 28 08:12:26 2010 +0000
+++ b/libswscale/utils.c	Fri Oct 29 13:48:12 2010 +0000
@@ -1554,15 +1554,15 @@
             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);