Roll to merge into origin/master

Roll to merge ffmpeg into origin/master

Summary of changes available at:
https://chromium.googlesource.com/chromium/third_party/ffmpeg/+log/f962bcb..ddfb37c

ddfb37c Fix gn file by making include win specific
9ae4fb5 Push -no-integrated-as into ffmpeg build file.
d2e12ee Support VS 2015 builds of ffmpeg with gn

BUG=124610, 440500
TBR=dalecurtis

Committed: https://crrev.com/a3fb777e944b9b13b79822bb6335bcd69eab8b9f
Cr-Commit-Position: refs/heads/master@{#362503}

[brucedawson, 2015-12-01 20:09:55]

This roll should work. The try changes are from a different commit, since
reverted.

PTAL.

[DaleCurtis, 2015-12-01 20:14:33]

lgtm

[brucedawson, 2015-12-01 20:15:19]

The CQ bit was checked by brucedawson@chromium.org

[commit-bot: I haz the power, 2015-12-01 20:26:48]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1491673002/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1491673002/1

[commit-bot: I haz the power, 2015-12-01 21:30:34]

Committed patchset #1 (id:1)

[commit-bot: I haz the power, 2015-12-01 21:31:18]

Description was changed from

==========
Roll to merge ffmpeg into origin/master

Summary of changes available at:
https://chromium.googlesource.com/chromium/third_party/ffmpeg/+log/f962bcb..d...

ddfb37c Fix gn file by making include win specific
9ae4fb5 Push -no-integrated-as into ffmpeg build file.
d2e12ee Support VS 2015 builds of ffmpeg with gn

BUG=124610,440500
TBR=dalecurtis
==========

to

==========
Roll to merge ffmpeg into origin/master

Summary of changes available at:
https://chromium.googlesource.com/chromium/third_party/ffmpeg/+log/f962bcb..d...

ddfb37c Fix gn file by making include win specific
9ae4fb5 Push -no-integrated-as into ffmpeg build file.
d2e12ee Support VS 2015 builds of ffmpeg with gn

BUG=124610,440500
TBR=dalecurtis

Committed: https://crrev.com/a3fb777e944b9b13b79822bb6335bcd69eab8b9f
Cr-Commit-Position: refs/heads/master@{#362503}
==========

[commit-bot: I haz the power, 2015-12-01 21:31:19]

Patchset 1 (id:??) landed as
https://crrev.com/a3fb777e944b9b13b79822bb6335bcd69eab8b9f
Cr-Commit-Position: refs/heads/master@{#362503}