summaryrefslogtreecommitdiff
path: root/localvideowebencode
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2021-02-05 23:17:07 +0100
committerJonas Smedegaard <dr@jones.dk>2021-02-05 23:17:07 +0100
commit326e51f83df911fc1b89b89d53cb2e93bd043b4c (patch)
treee6f63647ead0df57515e4742ede86ab99e0152b7 /localvideowebencode
parent5aa0159eadbf0fad035d6a1118cfb0e9be22be99 (diff)
fix support using melt for vp8/vp9 and ffmpeg for h264
Diffstat (limited to 'localvideowebencode')
-rwxr-xr-xlocalvideowebencode4
1 files changed, 2 insertions, 2 deletions
diff --git a/localvideowebencode b/localvideowebencode
index 4476047..bd64c5f 100755
--- a/localvideowebencode
+++ b/localvideowebencode
@@ -736,7 +736,7 @@ if [ -n "${webm:+$use_vpxenc$use_ffmpeg_vp8$use_oggenc}${vp9:+$use_vpxenc$use_ff
$_ffmpeg_stdin $_ffmpeg_mp4_onlyvideo \
${multipass:+-pass 2 -passlogfile ${stem}_h264} \
${stem}${channels:+_silent}.mp4"}}
- if [ -n "$webm" ] && [ -n "$channels" ]; then
+ if [ -n "${webm:+$use_vpxenc$use_ffmpeg_vp8$use_oggenc}" ] && [ -n "$channels" ]; then
echo >&2 "Encoding Vorbis audio and muxing with VP8 video..."
if [ -n "$use_oggenc" ]; then
$oggenc $_oggenc_wav_in $_oggenc_vorbis -o - $stem.wav \
@@ -750,7 +750,7 @@ if [ -n "${webm:+$use_vpxenc$use_ffmpeg_vp8$use_oggenc}${vp9:+$use_vpxenc$use_ff
$_ffmpeg_webm_keepvideo ${stem}.webm
fi
fi
- if [ -n "$vp9" ] && [ -n "$channels" ]; then
+ if [ -n "${vp9:+$use_vpxenc$use_ffmpeg_vp9$use_opusenc}" ] && [ -n "$channels" ]; then
echo >&2 "Encoding Opus audio and muxing with WebM/VP9 video..."
if [ -n "$use_opusenc" ]; then
$opusenc $_opusenc_wav_in $_opusenc_opus -o - $stem.wav \