Skip to content

Travis: up ffmpeg version to v2.4.2 #203

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

Merged
merged 5 commits into from
Jan 5, 2016
Merged

Travis: up ffmpeg version to v2.4.2 #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b3e838e
Travis: up ffmpeg version to v2.4.2
Dec 23, 2015
9914d01
Travis: added a variant to build with ffmpeg-2.5.7
Dec 23, 2015
9949143
Travis: added comments to explain ENABLE_COVERAGE environment variable
Dec 23, 2015
928add2
pyTest: temporary fix when testAddAllStreamsOfAGivenFile
Jan 5, 2016
36e3141
INSTALL: updated section of recommended version of dependencies
Jan 5, 2016
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
12 changes: 8 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,26 +23,30 @@ env:
matrix:
- DEPENDENCY_NAME=libav DEPENDENCY_VERSION=11.3 ENABLE_COVERAGE=true
- DEPENDENCY_NAME=libav DEPENDENCY_VERSION=11.3 ENABLE_COVERAGE=false
- DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.2.9 ENABLE_COVERAGE=true
- DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.2.9 ENABLE_COVERAGE=false
- DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.4.2 ENABLE_COVERAGE=true
- DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.4.2 ENABLE_COVERAGE=false
- DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.5.7 ENABLE_COVERAGE=false

matrix:
exclude:
# generate coverage only with gcc
- compiler: clang
env: DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.2.9 ENABLE_COVERAGE=true
env: DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.4.2 ENABLE_COVERAGE=true
- compiler: clang
env: DEPENDENCY_NAME=libav DEPENDENCY_VERSION=11.3 ENABLE_COVERAGE=true
# generate coverage only on linux
- os: osx
env: DEPENDENCY_NAME=libav DEPENDENCY_VERSION=11.3 ENABLE_COVERAGE=true
- os: osx
env: DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.2.9 ENABLE_COVERAGE=true
env: DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.4.2 ENABLE_COVERAGE=true
fast_finish: true

# This results in a 2×2×2x2 build matrix.
# Where the variables are: os / compiler / DEPENDENCY_NAME / ENABLE_COVERAGE

# If ENABLE_COVERAGE is True, we push the coverage to coveralls.
# If ENABLE_COVERAGE is False, we push the binaries to github releases.

addons:
apt:
sources: ['kalakris-cmake']
Expand Down
4 changes: 2 additions & 2 deletions INSTALL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ AvTranscoder uses CMake as build system.

#### Dependencies
AvTranscoder can depend on ffmpeg, libav, or any fork of these projects that follow the same API.
* Recommended ffmpeg versions: 2.2.2 or upper
* Recommended libav versions: not tested
* Recommended ffmpeg versions: 2.2.11, 2.4.2, 2.5.7
* Recommended libav versions: 11.3

#### To build
```
Expand Down
3 changes: 3 additions & 0 deletions test/pyTest/testTranscoderAdd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,5 +86,8 @@ def testAddAllStreamsOfAGivenFile():
import testTranscoderRewrap
# for each stream
for src_stream, dst_stream in zip(src_streams_properties, dst_streams_properties):
# FIXME: analyse only the first stream because all the input audio data are not read
if src_stream.getStreamId() != 1:
continue
# check properties
testTranscoderRewrap.checkStream(src_stream, dst_stream)