ffmpeg roll to repatched source r42314 BUG=none TEST=none
ffmpeg roll to repatched source r42314
BUG=none
TEST=none

Review URL: http://codereview.chromium.org/1105012

git-svn-id: http://src.chromium.org/svn/trunk/src@42315 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

Former-commit-id: caa0bbf6be82d3a154a1c667738fb201c90e176a
meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser