Cleanup to enc_x264 by antoine