Merge branch 'develop' of https://github.com/avTranscoder/avTranscoder into dev_addTestsForProcessStat

Clement Champetier · Clement Champetier · commit e1013df94e0c · 2016-01-05T13:09:53.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -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']
diff --git a/INSTALL.md b/INSTALL.md
@@ -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
 ```
diff --git a/test/pyTest/testTranscoderAdd.py b/test/pyTest/testTranscoderAdd.py
@@ -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)
