Link with ffmpeg

2016-02-17 22:21:14 +08:00 · 2016-02-17 22:21:14 +08:00 · 7fece7e9b3
commit 7fece7e9b3
parent 57f322a818
2 changed files with 4 additions and 1 deletions
--- 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',
                    ],
                  }],
                ],
--- a/vendor/brightray
+++ b/vendor/brightray
@ -1 +1 @@
-Subproject commit 2a5cd7178b641de91ca6eb0bca826fea588f923a
+Subproject commit d06de26dff8b641d9aee4c78ee830b416710f554