OSDN Git Service

swscale/utils: fix wrong deprecated message with rgb0
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Dec 2013 21:47:49 +0000 (22:47 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Dec 2013 21:47:49 +0000 (22:47 +0100)
Fixes Ticket3242
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libswscale/utils.c

index 80c789f..b8b95a9 100644 (file)
@@ -1120,13 +1120,14 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter,
     c->srcRange |= handle_jpeg(&c->srcFormat);
     c->dstRange |= handle_jpeg(&c->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");
+
     if (!c->contrast && !c->saturation && !c->dstFormatBpp)
         sws_setColorspaceDetails(c, ff_yuv2rgb_coeffs[SWS_CS_DEFAULT], c->srcRange,
                                  ff_yuv2rgb_coeffs[SWS_CS_DEFAULT],
                                  c->dstRange, 0, 1 << 16, 1 << 16);
 
-    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");
     handle_formats(c);
     srcFormat = c->srcFormat;
     dstFormat = c->dstFormat;