Merge "MPEG2TSWriter: Fix an off-by-one in the condition for padding"