Merge pull request #1 from youtube/master

Updates from base repo
Fixed width and height parameters of the encoder
Merge pull request #6 from vshcryabets/master

Wrong encoder width and height