Merge commit '8805589b803fab5f362008306319336ac79a3fa7'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 19:31:46 +0000 (20:31 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 19:31:51 +0000 (20:31 +0100)
commitd3d4d98764ea18b3f192ea92b13ee075263b4387
treeb3b696e8e0347c9f9962ec1763649193f7118030
parentc5b6b711b291f7cc3fc215de43896537cb7cfa44
parent8805589b803fab5f362008306319336ac79a3fa7
Merge commit '8805589b803fab5f362008306319336ac79a3fa7'

* commit '8805589b803fab5f362008306319336ac79a3fa7':
  libopencv: Rework error handling in parse_iplconvkernel()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/vf_libopencv.c