Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replacement of swsfilter for avfilter #2197

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Replacement of swsfilter for avfilter #2197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d80346
Upgrade versions of all Maven dependencies and plugins (pull #2159)
invalid-email-address Feb 29, 2024
b451585
replacement of swscale for avfilter
invalid-email-address Feb 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
572 changes: 286 additions & 286 deletions platform/pom.xml
View file
Open in desktop

Large diffs are not rendered by default.

86 changes: 43 additions & 43 deletions platform/src/main/assembly/bin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
<id>${project.version}-bin</id>
<formats>
<format>zip</format>
</formats>
<baseDirectory>${project.artifactId}-${project.version}-bin</baseDirectory>
<fileSets>
<fileSet>
<directory>${project.basedir}/..</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>samples/*</include>
<include>CHANGELOG*</include>
<include>README*</include>
<include>LICENSE*</include>
<include>NOTICE*</include>
</includes>
</fileSet>
<fileSet>
<directory>${project.build.directory}</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>*.jar</include>
</includes>
<excludes>
<exclude>android*.jar</exclude>
<exclude>gluegen*.jar</exclude>
<exclude>hamcrest*.jar</exclude>
<exclude>junit*.jar</exclude>
<exclude>jogl*.jar</exclude>
<exclude>jocl*.jar</exclude>
<exclude>*-javadoc.jar</exclude>
<exclude>*-sources.jar</exclude>
</excludes>
<fileMode>0644</fileMode>
</fileSet>
<fileSet>
<directory>${project.build.directory}/site</directory>
<outputDirectory>docs</outputDirectory>
</fileSet>
</fileSets>
</assembly>
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
<id>${project.version}-bin</id>
<formats>
<format>zip</format>
</formats>
<baseDirectory>${project.artifactId}-${project.version}-bin</baseDirectory>
<fileSets>
<fileSet>
<directory>${project.basedir}/..</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>samples/*</include>
<include>CHANGELOG*</include>
<include>README*</include>
<include>LICENSE*</include>
<include>NOTICE*</include>
</includes>
</fileSet>
<fileSet>
<directory>${project.build.directory}</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>*.jar</include>
</includes>
<excludes>
<exclude>android*.jar</exclude>
<exclude>gluegen*.jar</exclude>
<exclude>hamcrest*.jar</exclude>
<exclude>junit*.jar</exclude>
<exclude>jogl*.jar</exclude>
<exclude>jocl*.jar</exclude>
<exclude>*-javadoc.jar</exclude>
<exclude>*-sources.jar</exclude>
</excludes>
<fileMode>0644</fileMode>
</fileSet>
<fileSet>
<directory>${project.build.directory}/site</directory>
<outputDirectory>docs</outputDirectory>
</fileSet>
</fileSets>
</assembly>
42 changes: 21 additions & 21 deletions platform/src/main/assembly/src.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
<id>${project.version}-src</id>
<formats>
<format>zip</format>
</formats>
<baseDirectory>${project.artifactId}-${project.version}</baseDirectory>
<fileSets>
<fileSet>
<directory>${project.basedir}/..</directory>
<outputDirectory>/</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
<!-- TODO: use expresssions instead: ${project.build.sourceDirectory}, etc -->
<exclude>**/target/**</exclude>
<exclude>**/cppbuild/**</exclude>
</excludes>
</fileSet>
</fileSets>
</assembly>

<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
<id>${project.version}-src</id>
<formats>
<format>zip</format>
</formats>
<baseDirectory>${project.artifactId}-${project.version}</baseDirectory>
<fileSets>
<fileSet>
<directory>${project.basedir}/..</directory>
<outputDirectory>/</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
<!-- TODO: use expresssions instead: ${project.build.sourceDirectory}, etc -->
<exclude>**/target/**</exclude>
<exclude>**/cppbuild/**</exclude>
</excludes>
</fileSet>
</fileSets>
</assembly>
32 changes: 16 additions & 16 deletions platform/src/main/java9/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
module org.bytedeco.javacv.platform {
requires transitive org.bytedeco.javacv;
requires org.bytedeco.opencv.platform;
requires org.bytedeco.ffmpeg.platform;
requires org.bytedeco.flycapture.platform;
requires org.bytedeco.libdc1394.platform;
requires org.bytedeco.libfreenect.platform;
requires org.bytedeco.libfreenect2.platform;
requires org.bytedeco.librealsense.platform;
requires org.bytedeco.librealsense2.platform;
requires org.bytedeco.videoinput.platform;
requires org.bytedeco.artoolkitplus.platform;
requires org.bytedeco.flandmark.platform;
requires org.bytedeco.leptonica.platform;
requires org.bytedeco.tesseract.platform;
}
module org.bytedeco.javacv.platform {
requires transitive org.bytedeco.javacv;
requires org.bytedeco.opencv.platform;
requires org.bytedeco.ffmpeg.platform;
requires org.bytedeco.flycapture.platform;
requires org.bytedeco.libdc1394.platform;
requires org.bytedeco.libfreenect.platform;
requires org.bytedeco.libfreenect2.platform;
requires org.bytedeco.librealsense.platform;
requires org.bytedeco.librealsense2.platform;
requires org.bytedeco.videoinput.platform;
requires org.bytedeco.artoolkitplus.platform;
requires org.bytedeco.flandmark.platform;
requires org.bytedeco.leptonica.platform;
requires org.bytedeco.tesseract.platform;
}
Loading