Skip to content

Commit

Permalink
Release 2.4.6
Browse files Browse the repository at this point in the history
  • Loading branch information
a-schild committed Mar 4, 2019
1 parent 146fd9e commit 758de1c
Show file tree
Hide file tree
Showing 12 changed files with 34 additions and 35 deletions.
17 changes: 8 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ It includes all binaries for the supported platforms
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-all-deps</artifactId>
<version>2.4.5</version>
<version>2.4.6</version>
</dependency>
```

Expand All @@ -59,7 +59,7 @@ Generally if you want to use for one platform or more what you have to do is add
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-core</artifactId>
<version>2.4.5</version>
<version>2.4.6</version>
</dependency>
```

Expand All @@ -70,7 +70,7 @@ and then the specific jar(s) for your platform(s) :
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-native-linux64</artifactId>
<version>2.4.5</version>
<version>2.4.6</version>
</dependency>
```

Expand All @@ -79,7 +79,7 @@ and then the specific jar(s) for your platform(s) :
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-native-win64</artifactId>
<version>2.4.5</version>
<version>2.4.6</version>
</dependency>
```

Expand All @@ -88,7 +88,7 @@ and then the specific jar(s) for your platform(s) :
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-native-osx64</artifactId>
<version>2.4.5</version>
<version>2.4.6</version>
</dependency>
```

Expand All @@ -97,13 +97,13 @@ and then the specific jar(s) for your platform(s) :
It includes all binaries for the supported platforms

``` XML
compile group: 'ws.schild', name: 'jave-all-deps', version: '2.4.5'
compile group: 'ws.schild', name: 'jave-all-deps', version: '2.4.6'
```

### For one platform only (Linux 64Bit in this case)
``` XML
compile group: 'ws.schild', name: 'jave-core', version: '2.4.5'
compile group: 'ws.schild', name: 'jave-native-linux64', version: '2.4.5'
compile group: 'ws.schild', name: 'jave-core', version: '2.4.6'
compile group: 'ws.schild', name: 'jave-native-linux64', version: '2.4.6'
```

### Main Components of Jave2
Expand Down Expand Up @@ -237,7 +237,6 @@ For bug reports use the github site https://github.com/a-schild/jave2/issues

## Changelog
- **2.4.6**
- Prepare for next dev cycle
- Corrected win32 executable name, thanks to WavyPeng
- The bitrate was returned in kBps instead of Bps
- The channel detection did only work for mono+stereo, but not for quad (It does still not work for others)
Expand Down
14 changes: 7 additions & 7 deletions jave-all-deps/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>ws.schild</groupId>
<packaging>jar</packaging>
<version>2.4.6-SNAPSHOT</version>
<version>2.4.6</version>
<artifactId>jave-all-deps</artifactId>
<name>Jave all native dependencies package</name>
<description>The JAVE (Java Audio Video Encoder) library is Java wrapper on the
Expand Down Expand Up @@ -135,32 +135,32 @@
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-core</artifactId>
<version>2.4.6-SNAPSHOT</version>
<version>2.4.6</version>
</dependency>
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-native-win32</artifactId>
<version>2.4.6-SNAPSHOT</version>
<version>2.4.6</version>
</dependency>
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-native-win64</artifactId>
<version>2.4.6-SNAPSHOT</version>
<version>2.4.6</version>
</dependency>
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-native-linux32</artifactId>
<version>2.4.6-SNAPSHOT</version>
<version>2.4.6</version>
</dependency>
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-native-linux64</artifactId>
<version>2.4.6-SNAPSHOT</version>
<version>2.4.6</version>
</dependency>
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-native-osx64</artifactId>
<version>2.4.6-SNAPSHOT</version>
<version>2.4.6</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api -->
<dependency>
Expand Down
14 changes: 7 additions & 7 deletions jave-core-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>ws.schild</groupId>
<packaging>jar</packaging>
<version>2.4.6-SNAPSHOT</version>
<version>2.4.6</version>
<artifactId>jave-core-test</artifactId>
<build>
<plugins>
Expand All @@ -29,32 +29,32 @@
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-core</artifactId>
<version>2.4.6-SNAPSHOT</version>
<version>2.4.6</version>
</dependency>
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-native-win32</artifactId>
<version>2.4.6-SNAPSHOT</version>
<version>2.4.6</version>
</dependency>
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-native-win64</artifactId>
<version>2.4.6-SNAPSHOT</version>
<version>2.4.6</version>
</dependency>
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-native-linux32</artifactId>
<version>2.4.6-SNAPSHOT</version>
<version>2.4.6</version>
</dependency>
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-native-linux64</artifactId>
<version>2.4.6-SNAPSHOT</version>
<version>2.4.6</version>
</dependency>
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-native-osx64</artifactId>
<version>2.4.6-SNAPSHOT</version>
<version>2.4.6</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api -->
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion jave-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<groupId>ws.schild</groupId>
<artifactId>jave-core</artifactId>
<packaging>jar</packaging>
<version>2.4.6-SNAPSHOT</version>
<version>2.4.6</version>
<name>Jave core package</name>
<description>The JAVE (Java Audio Video Encoder) library is Java wrapper on the
ffmpeg project. Developers can take take advantage of JAVE2 to transcode
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public class DefaultFFMPEGLocator extends FFMPEGLocator {
* Trace the version of the bundled ffmpeg executable. It's a counter: every
* time the bundled ffmpeg change it is incremented by 1.
*/
private static final String MY_EXE_VERSION = "2.4.6-SNAPSHOT";
private static final String MY_EXE_VERSION = "2.4.6";

/**
* The ffmpeg executable file path.
Expand Down
6 changes: 3 additions & 3 deletions jave-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>ws.schild</groupId>
<packaging>jar</packaging>
<version>2.4.6-SNAPSHOT</version>
<version>2.4.6</version>
<artifactId>jave-example</artifactId>
<build>
<resources>
Expand Down Expand Up @@ -55,12 +55,12 @@
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-core</artifactId>
<version>2.4.6-SNAPSHOT</version>
<version>2.4.6</version>
</dependency>
<dependency>
<groupId>ws.schild</groupId>
<artifactId>jave-native-win64</artifactId>
<version>2.4.6-SNAPSHOT</version>
<version>2.4.6</version>
</dependency>
<!-- https://mvnrepository.com/artifact/commons-logging/commons-logging -->
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion jave-native-linux32/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>ws.schild</groupId>
<packaging>jar</packaging>
<version>2.4.6-SNAPSHOT</version>
<version>2.4.6</version>
<artifactId>jave-native-linux32</artifactId>
<name>Jave linux 32 bit native package</name>
<description>The JAVE (Java Audio Video Encoder) library is Java wrapper on the
Expand Down
2 changes: 1 addition & 1 deletion jave-native-linux64/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>ws.schild</groupId>
<packaging>jar</packaging>
<version>2.4.6-SNAPSHOT</version>
<version>2.4.6</version>
<artifactId>jave-native-linux64</artifactId>
<name>Jave linux 64 bit native package</name>
<description>The JAVE (Java Audio Video Encoder) library is Java wrapper on the
Expand Down
2 changes: 1 addition & 1 deletion jave-native-osx64/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>ws.schild</groupId>
<packaging>jar</packaging>
<version>2.4.6-SNAPSHOT</version>
<version>2.4.6</version>
<artifactId>jave-native-osx64</artifactId>
<name>Jave OSX 64 bit native package</name>
<description>The JAVE (Java Audio Video Encoder) library is Java wrapper on the
Expand Down
2 changes: 1 addition & 1 deletion jave-native-win32/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>ws.schild</groupId>
<packaging>jar</packaging>
<version>2.4.6-SNAPSHOT</version>
<version>2.4.6</version>
<artifactId>jave-native-win32</artifactId>
<name>Jave windows 32 bit native package</name>
<description>The JAVE (Java Audio Video Encoder) library is Java wrapper on the
Expand Down
2 changes: 1 addition & 1 deletion jave-native-win64/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>ws.schild</groupId>
<packaging>jar</packaging>
<version>2.4.6-SNAPSHOT</version>
<version>2.4.6</version>
<artifactId>jave-native-win64</artifactId>
<name>Jave windows 64 bit native package</name>
<description>The JAVE (Java Audio Video Encoder) library is Java wrapper on the
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
<artifactId>jave-modules</artifactId>
<packaging>pom</packaging>
<properties>
<revision>2.4.6-SNAPSHOT</revision>
<revision>2.4.6</revision>
<!-- Don't forget to change it also in DefaultFFMPEGLocator.java -->
</properties>

<version>2.4.6-SNAPSHOT</version>
<version>2.4.6</version>
<name>Jave master project</name>
<description>Jave master project</description>
<url>https://github.com/a-schild/jave2</url>
Expand Down

0 comments on commit 758de1c

Please sign in to comment.