ffmpeg roll to repatched source r42314

BUG=none
TEST=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42315 0039d316-1c4b-4281-b951-d872f2087c98

DEPS

@@ -2,7 +2,7 @@ vars = {
   "webkit_trunk":
     "http://svn.webkit.org/repository/webkit/trunk",
   "webkit_revision": "56350",
-  "ffmpeg_revision": "42082",
+  "ffmpeg_revision": "42314",
   "skia_revision": "504",
   "chromium_git": "http://src.chromium.org/git",
   "swig_revision": "40423",