Merge "C2SoftMpeg4Enc: Handle yStride not equal to aligned width" into qt-qpr1-dev