1berry/nwjs-ffmpeg-prebuilt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated guides

Browse Source
This commit is contained in:
Allan Amstadt 2016-03-30 16:31:11 +02:00
parent 8b879f9385
commit dba46a20b4
5 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -1,10 +1,12 @@
#FFmpeg prebuilt for NW.js #FFmpeg prebuilt for NW.js
FFMpeg prebuilt binaries and build instructions for window, linux and osx. FFMpeg prebuilt binaries and build instructions for window, linux and osx.
- [Windows guide](guides/build_windows.md) - [Windows guide](guides/build_windows.md)
- [Linux guide](guides/build_linux.md) - [Linux guide](guides/build_linux.md)
- [Mac guide](guides/build_mac.md) - [Mac guide](guides/build_mac.md)
You can get the FFmpeg source code from [here](https://chromium.googlesource.com/chromium/third_party/ffmpeg).
>###License and Patent Fee >###License and Patent Fee
> MP3 and H.264 codecs are licensed under the GPL in ffmpeg used by NW.js. Make sure your app are released with compatible license of GPL. And you also have to pay patent licensing royalties for using them. Consult a lawyer if you do not understand the licensing constraints and using patented media formats in your application. > MP3 and H.264 codecs are licensed under the GPL in ffmpeg used by NW.js. Make sure your app are released with compatible license of GPL. And you also have to pay patent licensing royalties for using them. Consult a lawyer if you do not understand the licensing constraints and using patented media formats in your application.

12
ffmpeg.patch
View File

@ -1,12 +0,0 @@
diff --git a/ffmpeg.gyp b/ffmpeg.gyp
index 294dd2e..7dfcd3a 100755
--- a/ffmpeg.gyp
+++ b/ffmpeg.gyp
@@ -72,7 +72,7 @@
['chromeos == 1', {
'ffmpeg_branding%': '<(branding)OS',
}, { # otherwise, assume Chrome/Chromium.
- 'ffmpeg_branding%': '<(branding)',
+ 'ffmpeg_branding%': 'Chrome'
}],
],

3
guides/build_linux.md
View File

@ -29,8 +29,7 @@
//install build deps //install build deps
./src/build/install-build-deps.sh ./src/build/install-build-deps.sh
//Apply the ffmpeg patch to enable Proprietary Codecs export GYP_DEFINES="ffmpeg_branding=Chrome ffmpeg_component=shared_library"
$(curl -fsSL https://raw.githubusercontent.com/iteufel/nwjs-ffmpeg-prebuilt/master/ffmpeg.patch) | git apply --directory src/third_party/ffmpeg -
//Regenerate the gyp files //Regenerate the gyp files
gclient runhooks --force gclient runhooks --force

3
guides/build_mac.md
View File

@ -32,8 +32,7 @@
##Build libffmpeg ##Build libffmpeg
//Apply the ffmpeg patch to enable Proprietary Codecs export GYP_DEFINES="ffmpeg_branding=Chrome ffmpeg_component=shared_library"
curl -fsSL https://raw.githubusercontent.com/iteufel/nwjs-ffmpeg-prebuilt/master/ffmpeg.patch | git apply --directory src/third_party/ffmpeg -
//Regenerate the gyp files //Regenerate the gyp files
gclient runhooks --force gclient runhooks --force

5
guides/build_windows.md
View File

@ -36,7 +36,7 @@
##Build ffmpeg.dll x64 ##Build ffmpeg.dll x64
//set some env //set some env
set DEPOT_TOOLS_WIN_TOOLCHAIN=0 set DEPOT_TOOLS_WIN_TOOLCHAIN=0
set GYP_DEFINES=clang=0 set GYP_DEFINES=clang=0 ffmpeg_branding=Chrome ffmpeg_component=shared_library
set GYP_MSVS_VERSION=2015 set GYP_MSVS_VERSION=2015
//Regenerate gyp files //Regenerate gyp files
@ -48,9 +48,8 @@
##Build ffmpeg.dll ia32 ##Build ffmpeg.dll ia32
//set some env //set some env
set DEPOT_TOOLS_WIN_TOOLCHAIN=0 set DEPOT_TOOLS_WIN_TOOLCHAIN=0
set GYP_DEFINES=target_arch=ia32 clang=0 set GYP_DEFINES=target_arch=ia32 clang=0 ffmpeg_branding=Chrome ffmpeg_component=shared_library
set GYP_MSVS_VERSION=2015 set GYP_MSVS_VERSION=2015
//Regenerate gyp files //Regenerate gyp files
gclient runhooks --force gclient runhooks --force