[FFmpeg-cvslog] Avoid incorrect deprecated pixel format warning.

Reimar Döffinger git at videolan.org
Sun May 5 10:01:58 CEST 2013


ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger at gmx.de> | Thu May  2 23:52:44 2013 +0200| [3bb1c58e953256ca614c79a511cd0a94e4673e79] | committer: Reimar Döffinger

Avoid incorrect deprecated pixel format warning.

Should only be printed if a "JPEG" format was used,
not for e.g. XYZ.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger at gmx.de>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3bb1c58e953256ca614c79a511cd0a94e4673e79
---

 libswscale/utils.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libswscale/utils.c b/libswscale/utils.c
index 28fd2e1..9badd0b 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -1064,13 +1064,14 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter,
 
     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");
     handle_0alpha(&srcFormat);
     handle_0alpha(&dstFormat);
     handle_xyz(&srcFormat);
     handle_xyz(&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;
     }



More information about the ffmpeg-cvslog mailing list