hevc: fix commit and clean up