Skip to content

Commit

Permalink
Migrate to ffmpeg
Browse files Browse the repository at this point in the history
  • Loading branch information
jaymoulin committed Jul 7, 2019
1 parent 1e33e93 commit b788b44
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ FROM builder

LABEL maintainer="Jay MOULIN <[email protected]> <https://twitter.com/MoulinJay>"

RUN apt-get update && apt-get install libav-tools -y --force-yes
RUN apt-get update && apt-get install ffmpeg -y --force-yes

ADD ./convert.sh /usr/bin/convert.sh

Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
VERSION ?= n4.2-dev
VERSION ?= 4.1.3
CACHE ?= --no-cache=1
FULLVERSION ?= n4.2-dev
FULLVERSION ?= 4.1.3
archs ?= amd64 arm32v5 arm32v7 arm64v8 i386 aarch64

.PHONY: all build publish latest
Expand Down
4 changes: 2 additions & 2 deletions convert.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ for f in **/*.{avi,ogm,wmv,AVI,OGM,WMV,flv,FLV,mkv,MKV,mov,MOV,m4v,M4V}; do
printf '\033[1;34;40m'
echo "Converting $f"
printf '\033[0m'
avconv -i "$f" -strict experimental -c:v libx264 "${f:0:-4}.mp4" && rm "$f"
ffmpeg -i "$f" -strict experimental -c:v libx264 "${f:0:-4}.mp4" && rm "$f"
done
for f in **/*.{divx,DIVX,webm,WEBM}; do
printf '\033[1;34;40m'
echo "Converting $f"
printf '\033[0m'
avconv -i "$f" -strict experimental -c:v libx264 "${f:0:-5}.mp4" && rm "$f"
ffmpeg -i "$f" -strict experimental -c:v libx264 "${f:0:-5}.mp4" && rm "$f"
done

0 comments on commit b788b44

Please sign in to comment.