Merge commit 'b1abd2aaf91be249f24cb74db9c205d9e4ca9da6'
authorHendrik Leppkes <h.leppkes@gmail.com>
Mon, 31 Aug 2015 08:07:34 +0000 (10:07 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Mon, 31 Aug 2015 08:07:34 +0000 (10:07 +0200)
commitea1061e147d33e33281570631cab7fdc1195e065
tree37f230dc47db940baf2a88b98091b6dc4e0e0750
parent80a12be10f39d5ce0c9e95f49d6b2ecb5750b334
parentb1abd2aaf91be249f24cb74db9c205d9e4ca9da6
Merge commit 'b1abd2aaf91be249f24cb74db9c205d9e4ca9da6'

* commit 'b1abd2aaf91be249f24cb74db9c205d9e4ca9da6':
  vf_scale: Add an option to pass the scaler params

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavfilter/vf_scale.c