diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-03-25 15:46:35 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-03-26 11:05:41 +0100 |
| commit | 3ab63abbd47156ed53994b3aaffbcc27a36d5f5b (patch) | |
| tree | a07118fd5ebd555a2c743f5032d47b1dc792f1fa /libswscale/utils.c | |
| parent | d2c76782e0e8a676159865f7c6e368ab0b1b6b51 (diff) | |
| download | ffmpeg-3ab63abbd47156ed53994b3aaffbcc27a36d5f5b.tar.gz | |
Do not set swscale sizeFactor to -1.
Fixes ticket #3495.
(cherry picked from commit e6fe804bdd6272de633ecf3fc73e1aba6746f641)
Diffstat (limited to 'libswscale/utils.c')
| -rw-r--r-- | libswscale/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libswscale/utils.c b/libswscale/utils.c index f2e41671a7..e4479925e6 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; } |