From 97df66daa34f084af31f284642ab3d052a6ef049 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sat, 6 Feb 2021 06:33:31 +0100 Subject: fix support using ffmpeg for h264 --- localvideowebencode | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/localvideowebencode b/localvideowebencode index ff1b072..4f43a99 100755 --- a/localvideowebencode +++ b/localvideowebencode @@ -555,13 +555,17 @@ for vformat in vp8 vp9 h264; do # melt (before v6.26) does not support encode-only hardware acceleration [ h264 = "$vformat" ] || [ -n "$vpxenc$gpu_vaapi" ] || eval "[ -z \"$multipass\" ] || use_ffmpeg_$vformat=yes" done -[ -n "$use_ffmpeg_h264" ] || use_melt_h264=yes if [ -n "$use_ffmpeg_vp8$use_ffmpeg_vp9$use_vpxenc" ]; then [ -n "$use_oggenc" ] || use_ffmpeg_ogg=yes [ -n "$use_opusenc" ] || use_ffmpeg_opus=yes [ -z "$use_oggenc$use_opusenc" ] || use_wav=yes [ -z "$use_ffmpeg_ogg$use_ffmpeg_opus" ] || use_matroska=yes fi +if [ -n "$use_ffmpeg_h264" ]; then + use_matroska=yes +else + use_melt_h264=yes +fi [ -z "$gpu" ] || echo >&2 "GPU platform enabled: $gpu" -- cgit v1.2.3