Merge changes I0cfdff9f,Ic9ae610c

* changes:
  Add correction factor in video time calculation
  Fix format errors