[Olena-patches] olena: olena-2.0-662-gfcf3eb5 Merge branch 'exp/image2d-ffmpeg' into exp/TL

This is a merge commit message of the following branches: Merge: 6a4f5c6 579a225 Conflicts: milena/mln/core/image/image2d_ffmpeg.hh milena/mln/core/image/image2d_ffmpeg.hh | 73 +++++++++++++++++++----------- 1 files changed, 46 insertions(+), 27 deletions(-) diff --cc milena/mln/core/image/image2d_ffmpeg.hh index ea000da,12550cb..c745171 --- a/milena/mln/core/image/image2d_ffmpeg.hh +++ b/milena/mln/core/image/image2d_ffmpeg.hh @@@ -265,10 -278,20 +278,19 @@@ namespace ml buffer_ = static_cast<V*>((void *)frame->data[0]); V* buf = static_cast<V*>((void *)frame->data[0]); for (unsigned i = 0; i < nr; ++i) - { - array_[i] = buf; - buf += frame->linesize[0]; - } - - { - array_[i] = buf; - buf += frame->linesize[0] / 3; - } ++ { ++ array_[i] = buf; ++ buf += frame->linesize[0] / 3; ++ } + + // FIXME: Not supporting padding for the moment! + int padding = frame->linesize[0] / 3 % frame->width; + if (padding) + { + std::cout << "This frame uses padding for memory alignment... " + << "Not supported for the moment!" << << std::endl; + abort(); + } } template <typename V> hooks/post-receive -- Olena, a generic and efficient image processing platform