[FFmpeg-cvslog] Merge commit '8805589b803fab5f362008306319336ac79a3fa7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 27 20:31:46 2015 +0100| [d3d4d98764ea18b3f192ea92b13ee075263b4387] | committer: Michael Niedermayer

Merge commit '8805589b803fab5f362008306319336ac79a3fa7'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d3d4d98764ea18b3f192ea92b13ee075263b4387
---