summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2016-02-29 18:55:46 +0100
committerJonas Smedegaard <dr@jones.dk>2016-02-29 18:55:46 +0100
commit39ab6b155452cbed8ecb3e095f189327de47a70f (patch)
tree4ee96fb121135280600439e61a64b42ecdd0c15f
parent99dfa115853ba23e13aa230521fc38f557ed6a3f (diff)
Stop check if melt is recent: 0.9.2 (needed for loudness filter and embedded qt-faststart) is in Debian stable (jessie).
-rwxr-xr-xlocalvideowebencode12
1 files changed, 1 insertions, 11 deletions
diff --git a/localvideowebencode b/localvideowebencode
index 2861235..28c8529 100755
--- a/localvideowebencode
+++ b/localvideowebencode
@@ -22,7 +22,6 @@
# * Offer to skip rendering again if an output file exist already.
# * Support --width and --height, resolving the other part from input
# or forced aspect ratio.
-# * Drop $melt_recent flag when melt 0.9.2 is stable.
# * Check and fail if all needed tools are not available.
# * Test if beneficial to apply real_time=-2.
# * Normalize each infile separately when xml fed as infile keeps sync.
@@ -172,9 +171,6 @@ done
processors=$(nproc)
[ $processors -gt 2 ] || processors=
-# Resolve if melt is version 0.9.2 or newer
-melt_recent=$(melt -query filter=loudness | grep -qi R128 && echo yes)
-
# sanitize infiles
infiles=$*
infile_first=$(perl -e 'print shift @ARGV' $infiles)
@@ -492,7 +488,7 @@ _ffmpeg_webm_onlyvideo_vp9="-f webm $_ffmpeg_video $_ffmpeg_vp9 -an}"
_melt_mp4="f=mp4 $_melt_video $_melt_h264 ${silence:+an=1 audio_off=1}${channels:+${use_mp3:+$_melt_mp3}${use_aac:+$_melt_aac}}"
_melt_img="f=image2 $_melt_video"
-[ -z "$melt_recent" ] || _melt_loudness="$loudness_data"
+_melt_loudness="$loudness_data"
if [ -n "$loudness" ] && [ -z "$silence$_melt_loudness" ]; then
echo "Analyzing audio dynamics..."
$melt $_melt_infiles \
@@ -625,12 +621,6 @@ else
${mp4:+-consumer avformat:$stem.mp4 $_melt_mp4}
fi
-if [ -n "$mp4" ] && [ -z "$melt_recent" ]; then
- mv "$stem.mp4" "$stem.mp4"~
- qt-faststart "$stem.mp4"~ "$stem.mp4"
- [ -f "$stem.mp4" ] && rm "$stem.mp4"~ || mv -f "$stem.mp4"~ "$stem.mp4"
-fi
-
# cleanup encoding cruft
rm -f $stem.xml $stem.wav $stem.mkv ${stem}_*.log ${stem}_*silent.webm