Fix the alignment issue in ffmpeg. Based on patch by Thorsten Jordan. Almost closes #757. Forwardport of [17595]