Merge "Transcoder: Fix error with short clips"