Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Compatibility with ffmpeg 2.6 #56

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Compatibility with ffmpeg 2.6 #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab9fa2c
Build with two ffmpeg versions
tahajahangir Mar 16, 2015
8e81cf9
Fix with ffmpeg 2.6
tahajahangir Mar 16, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,12 @@ python:
- "3.2"
- "3.3"

env:
- FFMPEG_STATIC=http://ffmpeg.gusari.org/static/64bit/ffmpeg.static.64bit.2014-07-16.tar.gz
- FFMPEG_STATIC=http://johnvansickle.com/ffmpeg/releases/ffmpeg-release-64bit-static.tar.xz

before_install:
- sudo sh ./test/install-ffmpeg.sh
- sudo sh -x ./test/install-ffmpeg.sh $FFMPEG_STATIC

script:
- python setup.py test
Expand Down
4 changes: 2 additions & 2 deletions converter/ffmpeg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,8 +453,8 @@ def on_sigalrm(*_):
ret = ret.decode(console_encoding)
total_output += ret
buf += ret
if '\r' in buf:
line, buf = buf.split('\r', 1)
if '\n' in buf:
line, buf = buf.split('\n', 1)

tmp = pat.findall(line)
if len(tmp) == 1:
Expand Down
8 changes: 5 additions & 3 deletions test/install-ffmpeg.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
# add-apt-repository -y ppa:jon-severinsson/ffmpeg
# apt-get -y -qq update
# apt-get -y -qq install ffmpeg
# list directory of ffmpeg binary file there is in http://ffmpeg.gusari.org/static/64bit/
wget -P /tmp http://ffmpeg.gusari.org/static/64bit/ffmpeg.static.64bit.latest.tar.gz
tar -xvf /tmp/ffmpeg.static.64bit.latest.tar.gz -C /usr/local/bin
# list directory of ffmpeg binary file there is in http://johnvansickle.com/ffmpeg/
wget -O /tmp/ffmpeg-static $1
mkdir /tmp/ffmpeg-bin/
tar -xvf /tmp/ffmpeg-static -C /tmp/ffmpeg-bin/
cp `find /tmp/ffmpeg-bin/ -name 'ff*' -executable -type f` /usr/local/bin