From 5bccb2d0965a66c132798c748b64a5025a5636a9 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 17 Nov 2011 21:51:25 +0100 Subject: [PATCH] sws: handle jpeg pixel formats in sws_init_context() Fixes Ticket576 Signed-off-by: Michael Niedermayer --- libswscale/utils.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libswscale/utils.c b/libswscale/utils.c index b4e230b705..781f728919 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -771,6 +771,15 @@ int sws_init_context(SwsContext *c, SwsFilter *srcFilter, SwsFilter *dstFilter) unscaled = (srcW == dstW && srcH == dstH); + handle_jpeg(&srcFormat); + handle_jpeg(&dstFormat); + + if(srcFormat!=c->srcFormat || dstFormat!=c->dstFormat){ + av_log(c, AV_LOG_WARNING, "deprecated pixel format used, make sure you did set range correctly\n"); + c->srcFormat= srcFormat; + c->dstFormat= dstFormat; + } + if (!sws_isSupportedInput(srcFormat)) { av_log(c, AV_LOG_ERROR, "%s is not supported as input pixel format\n", av_get_pix_fmt_name(srcFormat)); return AVERROR(EINVAL);