From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 9 May 2019 15:00:29 +0000 (+0200)
Subject: Merge branch 'telecaster' of git.parisson.com:git/telemeta into telecaster
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=refs%2Fheads%2Ftelecaster;p=telemeta.git

Merge branch 'telecaster' of git.parisson.com:git/telemeta into telecaster
---

aa810c2063a9337e506c9e99196a09e8e366bd39
diff --cc tools/scripts/transcode/transcode.py
index d648ba84,43b7919a..43b7919a
mode 100644,100755..100644
--- a/tools/scripts/transcode/transcode.py
+++ b/tools/scripts/transcode/transcode.py