Merge "Fix bad checks that causes crash when streaming H.263 content."