From 2715984095acda4a0360c22da7b2e234e548cef6 Mon Sep 17 00:00:00 2001 From: Tony Tkacik Date: Fri, 17 Jul 2015 09:25:31 +0200 Subject: [PATCH] Updated tdm-media to use avconv if ffmpeg is not present. Signed-off-by: Tony Tkacik --- bin/tdm-media | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/bin/tdm-media b/bin/tdm-media index 7b24b23..c01a4ab 100755 --- a/bin/tdm-media +++ b/bin/tdm-media @@ -1,11 +1,16 @@ -#!/system/bin/sh +#!/bin/bash + + +type ffmpeg > /dev/null 2>&1 && FFMPEG_OR_LIBAV=ffmpeg +type avconv > /dev/null 2>&1 && FFMPEG_OR_LIBAV=avconv function task.video.change.container { CONTAINER=$1; shift; - for video in "$@"; do + echo "Using $FFMPEG_OR_LIBAV for conversion." + for video in "$@"; do echo "Starting processing Video: $video"; - ffmpeg -i "$video" -vcodec copy -acodec copy "${video}.$CONTAINER" + $FFMPEG_OR_LIBAV -i "$video" -vcodec copy -acodec copy "${video}.$CONTAINER" echo "Processing done."; done }