Merge "Fix crash in MPEG2PSExtractor"