manual merge of Silvia's changes to the MPEG-2 section as hinted by her merge commit messages