diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2021-02-04 14:53:15 +0100 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2021-02-04 15:06:25 +0100 |
| commit | 3fa3eb8e82d521de5bd022a78f9fdaceaa9f68b4 (patch) | |
| tree | 4ce744e98e279f5112e53712b9c20d129fd5b6e3 | |
| parent | bf7fc1fb0edf060f09c4f8d98ffeb3bb82854084 (diff) | |
tidy: use internal variable $_melt_stdout (replacing $_melt_yuv4mpeg2)
| -rwxr-xr-x | localvideowebencode | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/localvideowebencode b/localvideowebencode index 4949a87..de3402d 100755 --- a/localvideowebencode +++ b/localvideowebencode @@ -518,7 +518,7 @@ _melt_mp3="$_melt_downmix acodec=libmp3lame${use_lame_abr:+ aq=$quality_lame}${u _melt_aac="$_melt_downmix acodec=aac ab=$((channels*bitrate_aac))k" # container options -_melt_yuv4mpeg2="f=yuv4mpegpipe $_melt_video pix_fmt=yuv420p an=1 audio_off=1" +_melt_stdout="-consumer avformat:pipe:1 f=yuv4mpegpipe $_melt_video pix_fmt=yuv420p an=1 audio_off=1" _ffmpeg_yuv4mpeg2_in="-f yuv4mpegpipe" _ffmpeg_rawvideo="-f rawvideo" _melt_wav="f=wav $_melt_pcm vn=1 video_off=1" @@ -558,16 +558,14 @@ fi if [ -n "$multipass" ] && [ -n "${webm:+$use_vpxenc$use_ffmpeg_vp8$use_oggenc}${vp9:+$use_vpxenc$use_ffmpeg_vp9$use_opusenc}" ]; then echo >&2 "Analyzing video complexity..." if [ -n "$use_vpxenc" ]; then - $melt $_melt_infiles $filters \ - -consumer avformat:pipe:1 $_melt_yuv4mpeg2 \ + $melt $_melt_infiles $filters $_melt_stdout \ | pee \ ${webm:+"$vpxenc_chained - $_vpxenc_vp8 \ -p 2 --pass=1 --fpf=${stem}_vp8.log -o /dev/null"} \ ${vp9:+"$vpxenc_chained - $_vpxenc_vp9 \ -p 2 --pass=1 --fpf=${stem}_vp9.log -o /dev/null"} else - $melt $_melt_infiles $filters \ - -consumer avformat:pipe:1 $_melt_yuv4mpeg2 \ + $melt $_melt_infiles $filters $_melt_stdout \ | $ffmpeg_chained $_ffmpeg_yuv4mpeg2_in -i pipe:0 \ ${webm:+$_ffmpeg_rawvideo $_ffmpeg_vp8 -an \ -pass 1 -passlogfile ${stem}_vp8 /dev/null} \ @@ -591,7 +589,7 @@ if [ -n "${webm:+$use_vpxenc$use_ffmpeg_vp8$use_oggenc}${vp9:+$use_vpxenc$use_ff $_melt_wav}} \ ${channels:+${use_matroska:+-consumer avformat:$stem.mkv \ $_melt_matroska_pcm}} \ - -consumer avformat:pipe:1 $_melt_yuv4mpeg2 \ + $_melt_stdout \ | pee \ ${webm:+${use_ffmpeg_vp8:+"$ffmpeg_chained \ $_ffmpeg_yuv4mpeg2_in -i pipe:0 \ |