This reverts commit 7f06a466.

When using a scaling algorithm other than nearest neighbor, this
change caused the picture padding to be scaled with the video.

Manual Cherry-Pick of 03025ff9b202d69de4d75732f387260ac2ed060e