Skip to content

Commit 40aaf73

Browse files
committed
fix: readme merge conflicts.
2 parents 1ee6fc0 + 9a77ba1 commit 40aaf73

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

README.md

+10-10
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ A simple NodeJS package for image compression powered by FFMPEG.
88

99
- Node.js 8.0.* up to latest.
1010

11-
- Operating System: Windows, Linux or Mac OS X.
11+
- Operating System: Windows, Linux.
1212

1313
- FFMPEG Binaries or Executable File:
1414

1515
- To get the latest static build for **Linux**: [Linux FFMPEG Static Build](https://johnvansickle.com/ffmpeg/)
1616

1717
- For **Windows** you can download it via this link: [Windows FFMPEG Build](https://ffmpeg.zeranoe.com/builds/)
1818

19-
- **Note:** The **Mac OS** is currently not supported by this package as of the moment.
19+
- While as of the moment, the **Mac OS** is currently not supported by this package.
2020

2121
- To check the FFMPEG latest build or release please refer to this link: [FFMPEG Main Download Link](https://ffmpeg.org/download.html)
2222

@@ -52,8 +52,8 @@ var imgSqueezer = new ImageSqueezer.FFMPEGComppresion();
5252
// if the package fit for the current environment.
5353
imgSqueezer.load();
5454

55-
// Override the default binaries ffmpeg.
56-
imgSqueezer.setBin('/path/to/binary');
55+
// Set the default binaries file.
56+
imgSqueezer.setBin('/path/to/ffmpeg');
5757

5858
// Provide the source file path of the desire image
5959
// that will be compress later on.
@@ -85,8 +85,8 @@ var imgSqueezer = new ImageSqueezer.FFMPEGComppresion();
8585
// if the package fit for the current environment.
8686
imgSqueezer.load();
8787

88-
// Override the default binaries ffmpeg.
89-
imgSqueezer.setBin('/path/to/binary');
88+
// Set the default binaries file.
89+
imgSqueezer.setBin('/path/to/ffmpeg');
9090

9191
// Provide the source file path of the desire image
9292
// that will be compress later on.
@@ -120,8 +120,8 @@ var imgSqueezer = new ImageSqueezer.ProgressiveJPEG();
120120
// if the package fit for the current environment.
121121
imgSqueezer.load();
122122

123-
// Override the default binaries ffmpeg.
124-
imgSqueezer.setBin('/path/to/binary');
123+
// Set the default binaries file.
124+
imgSqueezer.setBin('/path/to/convert');
125125

126126
// Provide the source file path of the desire image
127127
// that will be compress later on.
@@ -149,8 +149,8 @@ var imgSqueezer = new ImageSqueezer.ProgressiveJPEG();
149149
// if the package fit for the current environment.
150150
imgSqueezer.load();
151151

152-
// Override the default binaries ffmpeg.
153-
imgSqueezer.setBin('/path/to/binary');
152+
// Set the default binaries file.
153+
imgSqueezer.setBin('/path/to/convert');
154154

155155
// Provide the source file path of the desire image
156156
// that will be compress later on.

0 commit comments

Comments
 (0)