Merge branch 'patch-3' of github.com:sujayjaju/PHP-FFMpeg into sujayjaju-patch-3

* 'patch-3' of github.com:sujayjaju/PHP-FFMpeg:
  Use watermark image while watermarking!
This commit is contained in:
Romain Neutron 2015-01-30 19:45:21 +01:00
commit 6cd008128c

View file

@ -70,6 +70,6 @@ class WatermarkFilter implements VideoFilterInterface
break;
}
return array('-vf', sprintf('overlay %s:%s', $x, $y));
return array('-vf', sprintf('movie=%s [watermark]; [in][watermark] overlay=%s:%s [out]', $this->watermarkPath, $x, $y));
}
}