aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattias Andrée <maandree@kth.se>2024-06-16 15:16:29 +0200
committerMattias Andrée <maandree@kth.se>2024-06-16 15:16:29 +0200
commit6a759b1e341c96ab7f7389db1600f2f764c6a9c5 (patch)
tree99517ccd3e5fd22bbf9b8457f0b8b31185c571a2
parentMinor fixes (diff)
parentFix printf usage (diff)
downloaddotfiles-6a759b1e341c96ab7f7389db1600f2f764c6a9c5.tar.gz
dotfiles-6a759b1e341c96ab7f7389db1600f2f764c6a9c5.tar.bz2
dotfiles-6a759b1e341c96ab7f7389db1600f2f764c6a9c5.tar.xz
Merge branch 'master' of ssh://maandree.se/gitrepos/~maandree/dotfiles
-rwxr-xr-xffmpeg/resize-and-transcode4
-rwxr-xr-xffmpeg/resize-and-transcode-recursively2
2 files changed, 4 insertions, 2 deletions
diff --git a/ffmpeg/resize-and-transcode b/ffmpeg/resize-and-transcode
index f3fe017..2b7b962 100755
--- a/ffmpeg/resize-and-transcode
+++ b/ffmpeg/resize-and-transcode
@@ -13,7 +13,7 @@ err () {
colour="$1"
format="$2"
shift 2
- printf '\x1b['"${colour}m${format}"'\x1b[m\n' "$@" >&2
+ printf '\033['"${colour}m${format}"'\033[m\n' "$@" >&2
}
alert () { err "1;31" "$@"; }
@@ -99,8 +99,10 @@ if test -z "$scale" && test "$codec" = '-c:v copy'; then
exit 1
fi
+ttysetting="$(stty -g)"
ffmpeg -i "$input" $scale $codec -c:a copy -- "$output"
ret=$?
+stty -- "$ttysetting"
if test $ret = 0; then
oldsize=$(stat -c '%s' -- "$input")
diff --git a/ffmpeg/resize-and-transcode-recursively b/ffmpeg/resize-and-transcode-recursively
index 8a7a207..c420de3 100755
--- a/ffmpeg/resize-and-transcode-recursively
+++ b/ffmpeg/resize-and-transcode-recursively
@@ -12,7 +12,7 @@ err () {
colour="$1"
format="$2"
shift 2
- printf '\x1b['"${colour}m${format}"'\x1b[m\n' "$@" >&2
+ printf '\033['"${colour}m${format}"'\033[m\n' "$@" >&2
}
alert () { err "1;31" "$@"; }