[FFmpeg-cvslog] Do not set swscale sizeFactor to -1.

Carl Eugen Hoyos git at videolan.org
Tue Mar 25 16:55:43 CET 2014


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Tue Mar 25 15:46:35 2014 +0100| [e6fe804bdd6272de633ecf3fc73e1aba6746f641] | committer: Carl Eugen Hoyos

Do not set swscale sizeFactor to -1.

Fixes ticket #3495.

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

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

diff --git a/libswscale/utils.c b/libswscale/utils.c
index 483b0b2..af22cfa 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -367,7 +367,7 @@ static av_cold int initFilter(int16_t **outFilter, int32_t **filterPos,
         int sizeFactor = -1;
 
         for (i = 0; i < FF_ARRAY_ELEMS(scale_algorithms); i++) {
-            if (flags & scale_algorithms[i].flag) {
+            if (flags & scale_algorithms[i].flag && scale_algorithms[i].size_factor > 0) {
                 sizeFactor = scale_algorithms[i].size_factor;
                 break;
             }



More information about the ffmpeg-cvslog mailing list