Merge "libjpegrecoverymap: refactor encode APIs"