From 8bc49002d2e8b0fa012cd7e659bfcfc01726a241 Mon Sep 17 00:00:00 2001
From: Alex Xu <alex_y_xu@yahoo.ca>
Date: Wed, 26 Feb 2014 21:26:48 -0500
Subject: meh
---
.travis.sh | 8 ++++----
Makefile | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.travis.sh b/.travis.sh
index 9554158..a0dc3d4 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -20,7 +20,7 @@ case "$1" in
mv *.rpyc unrpyc
;;
install)
- sudo apt-get install -q libtheora-dev libvpx-dev libx264-dev yasm
+ sudo apt-get install -qq libtheora-dev libvpx-dev libx264-dev yasm
cd libwebp-0.4.0
sed -i -e '/unset ac_cv_header_GL_glut_h/d' configure
@@ -48,8 +48,8 @@ case "$1" in
cd opus-1.1
./configure --disable-shared --disable-extra-programs --disable-dependency-tracking --quiet
- make $MAKEOPTS
- sudo make $MAKEOPTS install
+ make $MAKEOPTS >/dev/null
+ sudo make $MAKEOPTS install >/dev/null
cd ..
cd ffmpeg
@@ -62,7 +62,7 @@ case "$1" in
rm data.rpa
;;
script)
- exec make
+ exec make $MAKEOPTS
;;
*)
exit 1
diff --git a/Makefile b/Makefile
index 5b2c251..e278e85 100644
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@ ifdef NOTEMP
else
%.mp4: %.y4m
endif
- $(FFMPEG) -i "$<" -c:v libx264 -preset slower -tune animation -movflags empty_moov -profile:v baseline -c:a libfdk_aac -vbr 1 "$@"
+ $(FFMPEG) -i "$<" -c:v libx264 -preset slower -tune animation -movflags empty_moov -profile:v baseline -c:a libfdk_aac -b:a 60k "$@"
ifdef NOTEMP
%.webm: %.mkv
@@ -86,7 +86,7 @@ audio: $(CAUDIO)
$(FFMPEG) -i "$<" -c:a libopus -vbr 1 -b:a 64k "$@"
%.m4a: %.wav
- $(FFMPEG) -i "$<" -c:a libfdk_aac -vbr 1 "$@"
+ $(FFMPEG) -i "$<" -b:a 60k "$@"
# === IMAGES ===
--
cgit v1.2.3-70-g09d2