Merge "SoftAVCEncoder: fix mismatched type for comparison." into lmp-dev