In one embodiment, a method for encoding content includes receiving source content and encoding the source content into a plurality of content streams. The encoding includes aligning the plurality of content streams at Group of Pictures (GOP) boundaries. The encoding further includes embedding, in each content stream, metadata identifying segmentation points within the content stream, where the segmentation points correspond to one or more of the GOP boundaries.