From 65a027f72a1fa5704030e7ee9aef813d560860d6 Mon Sep 17 00:00:00 2001
From: Alex Xu <alex_y_xu@yahoo.ca>
Date: Thu, 27 Mar 2014 13:43:42 -0400
Subject: fix travis

---
 .travis.sh  | 3 ---
 .travis.yml | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/.travis.sh b/.travis.sh
index 1947589..753de69 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -74,9 +74,6 @@ case "$1" in
     cd ..
     rm -rf libvpx-v1.3.0
 
-    cd apngasm-2.8
-
-
     cd ffmpeg
     ./configure --disable-everything --disable-logging --disable-programs --disable-runtime-cpudetect --enable-decoder=mpeg4 --enable-decoder=pcm_s16le --enable-decoder=vorbis --enable-decoder=rawvideo --enable-demuxer=matroska --enable-demuxer=ogg --enable-demuxer=wav --enable-demuxer=yuv4mpegpipe --enable-encoder=libfdk_aac --enable-encoder=libopus --enable-encoder=libtheora --enable-encoder=libvpx_vp8 --enable-encoder=libvpx_vp9 --enable-encoder=libx264 --enable-encoder=pcm_s16le --enable-encoder=rawvideo --enable-ffmpeg --enable-filter=aresample --enable-gpl --enable-hardcoded-tables --enable-libfdk_aac --enable-libopus --enable-libtheora --enable-libvpx --enable-libx264 --enable-muxer=ipod --enable-muxer=mp4 --enable-muxer=ogg --enable-muxer=wav --enable-muxer=webm --enable-muxer=yuv4mpegpipe --enable-nonfree --enable-protocol=file
     make $MAKEOPTS >/dev/null
diff --git a/.travis.yml b/.travis.yml
index f04c491..c9b77ea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ language: c
 python: '3.3'
 node_js: '0.11'
 env: MINIMAL=1 CFLAGS="-O2 -march=native -pipe" CXXFLAGS="-O2 -march=native -pipe"
-  MAKEOPTS="-j8" FFMPEG="ffmpeg -t 00:00:05"
+  MAKEOPTS="-j8" FFMPEGFLAGS="-t 00:00:05"
 before_install: ./.travis.sh before_install
 install: ./.travis.sh install
 script: ./.travis.sh script
-- 
cgit v1.2.3-70-g09d2