cleanup libopenjpeg patch of shr

and indent ffmpeg-style