Bundle more libraries from VA-API as required by FFmpeg 5.0

Also fix up tritonserver/README.md as per pull #1124
bytedeco · Jan 19, 2022 · 50f602f · 50f602f
1 parent 853f861
commit 50f602f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/avutil.java b/ffmpeg/src/main/java/org/bytedeco/ffmpeg/presets/avutil.java
@@ -63,7 +63,7 @@
             "<libavutil/tx.h>", "<libavutil/version.h>", "log_callback.h"},
             includepath = {"/usr/local/include/ffmpeg/", "/opt/local/include/ffmpeg/", "/usr/include/ffmpeg/"},
             link = "avutil@.57", compiler = {"default", "nodeprecated"}),
-        @Platform(value = "linux-x86", preload = {"va@.1", "drm@.2", "va-drm@.1"}, preloadpath = {"/usr/lib32/", "/usr/lib/"}),
+        @Platform(value = "linux-x86", preload = {"va@.1", "drm@.2", "va-drm@.1", "va-x11@.1"}, preloadpath = {"/usr/lib32/", "/usr/lib/"}),
         @Platform(value = "linux-x86_64", preloadpath = {"/usr/lib64/", "/usr/lib/"}),
         @Platform(value = "windows", includepath = {"C:/MinGW/local/include/ffmpeg/", "C:/MinGW/include/ffmpeg/"}, preload = "avutil-57"),
         @Platform(extension = "-gpl")

diff --git a/tritonserver/README.md b/tritonserver/README.md
@@ -79,7 +79,10 @@ This sample is the Java implementation of the simple example written for the [C
 
 ### Steps to run any binary linked to Triton Inference Server using JavaCPP inside an NGC container
 
- 1. Similar to the `pom.xml` for `Simple.java`:
+To run your code, you will need to:
+
+ 1. Create `pom.xml` and `<your code>.java` source files, and
+ 2. Similar to the `pom.xml` for `Simple.java`, execute with:
 ```bash
  $ mvn compile exec:java
 ```