merge arut's flv_discont patch