From 7fece7e9b3ecfa57b5a37e07c2f4eb65169589dd Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 17 Feb 2016 22:21:14 +0800
Subject: [PATCH] Link with ffmpeg

---
 atom.gyp         | 3 +++
 vendor/brightray | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/atom.gyp b/atom.gyp
index dbaf6db56298..c8c714858b43 100644
--- a/atom.gyp
+++ b/atom.gyp
@@ -144,6 +144,7 @@
                   }, {
                     'copied_libraries': [
                       '<(libchromiumcontent_dir)/pdf.dll',
+                      '<(libchromiumcontent_dir)/ffmpeg.dll',
                     ],
                   }],
                 ],
@@ -193,6 +194,7 @@
                   }, {
                     'copied_libraries': [
                       '<(PRODUCT_DIR)/lib/libnode.so',
+                      '<(libchromiumcontent_dir)/libffmpeg.so',
                     ],
                   }],
                 ],
@@ -461,6 +463,7 @@
                   }, {
                     'copied_libraries': [
                       '<(PRODUCT_DIR)/libnode.dylib',
+                      '<(libchromiumcontent_dir)/libffmpeg.dylib',
                     ],
                   }],
                 ],
diff --git a/vendor/brightray b/vendor/brightray
index 2a5cd7178b64..d06de26dff8b 160000
--- a/vendor/brightray
+++ b/vendor/brightray
@@ -1 +1 @@
-Subproject commit 2a5cd7178b641de91ca6eb0bca826fea588f923a
+Subproject commit d06de26dff8b641d9aee4c78ee830b416710f554