[FFmpeg-cvslog] swscale/utils : simplify unscaled initial test for float pixfmt

Martin Vignali git at videolan.org
Wed Oct 24 22:22:53 EEST 2018


ffmpeg | branch: master | Martin Vignali <martin.vignali at gmail.com> | Mon Oct 22 22:55:14 2018 +0200| [3db33b446f3cd1d3b7142b0ab0e4dcbbec968ee9] | committer: Martin Vignali

swscale/utils : simplify unscaled initial test for float pixfmt

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

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

diff --git a/libswscale/utils.c b/libswscale/utils.c
index cb40164a95..d5913ed733 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -1810,8 +1810,7 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter,
     /* unscaled special cases */
     if (unscaled && !usesHFilter && !usesVFilter &&
         (c->srcRange == c->dstRange || isAnyRGB(dstFormat) ||
-         srcFormat == AV_PIX_FMT_GRAYF32 && dstFormat == AV_PIX_FMT_GRAY8 ||
-         srcFormat == AV_PIX_FMT_GRAY8 && dstFormat == AV_PIX_FMT_GRAYF32)) {
+         isFloat(srcFormat) || isFloat(dstFormat))){
         ff_get_unscaled_swscale(c);
 
         if (c->swscale) {



More information about the ffmpeg-cvslog mailing list