[upstream] XviD-1.3.3: fixes.