Merge "Fix mpeg4/h.263 software decoder."