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)
* commit '8805589b803fab5f362008306319336ac79a3fa7':
  libopencv: Rework error handling in parse_iplconvkernel()

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

Simple merge