From e75b939d479ce8120d2d30d7275849e3377a990e Mon Sep 17 00:00:00 2001 From: mstorsjo Date: Fri, 29 Oct 2010 13:48:12 +0000 Subject: [PATCH] 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 git-svn-id: file:///var/local/repositories/mplayer/trunk/libswscale@32562 b3059339-0415-0410-9bf9-f77b7e298cf2 --- utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils.c b/utils.c index 6365522..166e983 100644 --- a/utils.c +++ b/utils.c @@ -1554,15 +1554,15 @@ struct SwsContext *sws_getCachedContext(struct SwsContext *context, 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); -- 2.11.4.GIT