Skip to content

Commit 102384c

Browse files
author
Clement Champetier
committed
Travis: allow failures when build with libav
1 parent 26f73cc commit 102384c

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

.travis.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@ matrix:
4848
env: DEPENDENCY_NAME=libav DEPENDENCY_VERSION=11.3 ENABLE_COVERAGE=true
4949
- os: osx
5050
env: DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.4.2 ENABLE_COVERAGE=true
51+
allow_failures:
52+
# build with libav
53+
- env: DEPENDENCY_NAME=libav DEPENDENCY_VERSION=11.3 ENABLE_COVERAGE=true
54+
- env: DEPENDENCY_NAME=libav DEPENDENCY_VERSION=11.3 ENABLE_COVERAGE=false
5155
fast_finish: true
5256

5357
# This results in a 2×2×2x2 build matrix.
@@ -92,7 +96,7 @@ script:
9296
- ./tools/travis/build.sh
9397

9498
# launch tests
95-
- if [ ${TRAVIS_OS_NAME} = "linux" ] && [ ${DEPENDENCY_NAME} = "ffmpeg" ]; then ./tools/travis/python.nosetests.sh; fi
99+
- if [ ${TRAVIS_OS_NAME} = "linux" ]; then ./tools/travis/python.nosetests.sh; fi
96100

97101
after_success:
98102
# generate coverage for coveralls

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# avTranscoder
22

3-
C++ API for Libav / FFmpeg
3+
C++ API for FFmpeg / Libav
44

5-
Based on Libav/FFmpeg libraries to support various video and audio formats, avTranscoder provides the high level API to re-wrap or transcode media easily.
5+
Based on FFmpeg/Libav libraries to support various video and audio formats, avTranscoder provides the high level API to re-wrap or transcode media easily.
66

77
[![Build Status](https://travis-ci.org/avTranscoder/avTranscoder.svg?branch=develop)](https://travis-ci.org/avTranscoder/avTranscoder)
88
[![Build status](https://ci.appveyor.com/api/projects/status/6urf0otyhtj8xuny?svg=true)](https://ci.appveyor.com/project/cchampet/avtranscoder)
@@ -13,6 +13,8 @@ Based on Libav/FFmpeg libraries to support various video and audio formats, avTr
1313
[![Stories in Progress](https://badge.waffle.io/avTranscoder/avTranscoder.svg?label=2 - Working&title=In Progress)](http://waffle.io/avTranscoder/avTranscoder)
1414
Click on the badge above to have a big picture view of what's in progress and how you can help.
1515

16+
:warning: The latest avTranscoder API does not fit with libav.
17+
1618
#### What you need to know
1719
* C++ library
1820
* Java and Python bindings generated with SWIG

0 commit comments

Comments
 (0)