Revert r123145
Revert r123145

Since ffmpeg roll got reverted in r123249, this needs to be rolled
back as well.

BUG=110776
TEST=none

Review URL: https://chromiumcodereview.appspot.com/9455019

git-svn-id: de016e52bd170d2d4f2344f9bf92d50478b649e0@123283 0039d316-1c4b-4281-b951-d872f2087c98

adobe/chromium,ropik/chromium,adobe/chromium,gavinp/chromium,adobe/chromium,gavinp/chromium,ropik/chromium,ropik/chromium,adobe/chromium,yitian134/chromium,ropik/chromium,ropik/chromium,adobe/chromium,gavinp/chromium,adobe/chromium,gavinp/chromium,adobe/chromium,adobe/chromium,yitian134/chromium,ropik/chromium,adobe/chromium,yitian134/chromium,gavinp/chromium,yitian134/chromium,gavinp/chromium,yitian134/chromium,ropik/chromium,gavinp/chromium,yitian134/chromium,gavinp/chromium,adobe/chromium,gavinp/chromium,adobe/chromium,ropik/chromium,ropik/chromium,yitian134/chromium,yitian134/chromium,gavinp/chromium,yitian134/chromium,yitian134/chromium