summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kratochvil <jan@jankratochvil.net>2023-10-03 12:46:43 +0800
committerJosef Schlehofer <pepe.schlehofer@gmail.com>2023-10-04 18:33:57 +0200
commit5aa7afd338b371dfd460d3e55df7b8bd241c7c1f (patch)
tree0b178e4f790c465b30b00c5677fffc780ed38620
parent5403af094f6d8bcaecb140391f6095d0eb4faaeb (diff)
ffmpeg: Add avi muxer
Otherwise one cannot produce *.avi containers needed for some H.264 camera codecs. Signed-off-by: Jan Kratochvil <jan@jankratochvil.net> (cherry picked from commit 62f01d7b36ca621f3b9e2e01c78a64e897dbf4e8)
-rw-r--r--multimedia/ffmpeg/Config.in3
-rw-r--r--multimedia/ffmpeg/Makefile1
2 files changed, 4 insertions, 0 deletions
diff --git a/multimedia/ffmpeg/Config.in b/multimedia/ffmpeg/Config.in
index 93cdd67cd..574ba2783 100644
--- a/multimedia/ffmpeg/Config.in
+++ b/multimedia/ffmpeg/Config.in
@@ -303,6 +303,9 @@ comment "Muxers"
config FFMPEG_CUSTOM_MUXER_ac3
bool "AC3"
+config FFMPEG_CUSTOM_MUXER_avi
+ bool "AVI"
+
config FFMPEG_CUSTOM_MUXER_h264
bool "H.264 Raw Video"
depends on FFMPEG_CUSTOM_PATENTED
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 8de7f10b7..fa2fc1e6e 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -67,6 +67,7 @@ FFMPEG_CUSTOM_DECODERS:= \
FFMPEG_CUSTOM_MUXERS:= \
ac3 \
+ avi \
ffm \
h264 \
hevc \