From ff99c8a01b03722f9d65a98046d3b469afa2a22b Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 4 Feb 2021 15:03:55 +0100 Subject: tidy: use internal variable $_ffmpeg_stdin (replacing $_yuv4mpeg2_in) --- localvideowebencode | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/localvideowebencode b/localvideowebencode index de3402d..9ff9e8c 100755 --- a/localvideowebencode +++ b/localvideowebencode @@ -519,7 +519,7 @@ _melt_aac="$_melt_downmix acodec=aac ab=$((channels*bitrate_aac))k" # container options _melt_stdout="-consumer avformat:pipe:1 f=yuv4mpegpipe $_melt_video pix_fmt=yuv420p an=1 audio_off=1" -_ffmpeg_yuv4mpeg2_in="-f yuv4mpegpipe" +_ffmpeg_stdin="-f yuv4mpegpipe -i pipe:0" _ffmpeg_rawvideo="-f rawvideo" _melt_wav="f=wav $_melt_pcm vn=1 video_off=1" _ffmpeg_wav_in="-f wav" @@ -566,7 +566,7 @@ if [ -n "$multipass" ] && [ -n "${webm:+$use_vpxenc$use_ffmpeg_vp8$use_oggenc}${ -p 2 --pass=1 --fpf=${stem}_vp9.log -o /dev/null"} else $melt $_melt_infiles $filters $_melt_stdout \ - | $ffmpeg_chained $_ffmpeg_yuv4mpeg2_in -i pipe:0 \ + | $ffmpeg_chained $_ffmpeg_stdin \ ${webm:+$_ffmpeg_rawvideo $_ffmpeg_vp8 -an \ -pass 1 -passlogfile ${stem}_vp8 /dev/null} \ ${vp9:+$_ffmpeg_rawvideo $_ffmpeg_vp9 -an \ @@ -592,8 +592,7 @@ if [ -n "${webm:+$use_vpxenc$use_ffmpeg_vp8$use_oggenc}${vp9:+$use_vpxenc$use_ff $_melt_stdout \ | pee \ ${webm:+${use_ffmpeg_vp8:+"$ffmpeg_chained \ - $_ffmpeg_yuv4mpeg2_in -i pipe:0 \ - $_ffmpeg_webm_onlyvideo \ + $_ffmpeg_stdin $_ffmpeg_webm_onlyvideo \ ${multipass:+-pass 2 -passlogfile ${stem}_vp8} \ ${stem}${channels:+_silent}.webm"}} \ ${webm:+${use_vpxenc:+"$vpxenc_chained - $_vpxenc_vp8 \ @@ -601,8 +600,7 @@ if [ -n "${webm:+$use_vpxenc$use_ffmpeg_vp8$use_oggenc}${vp9:+$use_vpxenc$use_ff ${multipass:+-p 2 --pass=2 --fpf=${stem}_vp8.log} \ -o ${stem}${channels:+_silent}.webm"}} \ ${vp9:+${use_ffmpeg_vp9:+"$ffmpeg_chained \ - $_ffmpeg_yuv4mpeg2_in -i pipe:0 \ - $_ffmpeg_webm_onlyvideo_vp9 \ + $_ffmpeg_stdin $_ffmpeg_webm_onlyvideo_vp9 \ ${multipass:+-pass 2 -passlogfile ${stem}_vp9} \ ${stem}_vp9${channels:+_silent}.webm"}} \ ${vp9:+${use_vpxenc:+"$vpxenc_chained - $_vpxenc_vp9 \ -- cgit v1.2.3