Skip to content

Commit c613802

Browse files
author
Clement Champetier
committed
Merge branch 'develop' of https://github.com/avTranscoder/avTranscoder into dev_addAvFilter
Conflicts: src/AvTranscoder/Library.cpp src/AvTranscoder/common.cpp
2 parents ec6b1de + 6a915de commit c613802

File tree

190 files changed

+10628
-9546
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

190 files changed

+10628
-9546
lines changed

‎.travis.yml

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,31 @@ env:
2121
- DEPENDENCY_INSTALL=install-dependency
2222
- DEPENDENCY_INSTALL_PATH=${TRAVIS_BUILD_DIR}/${DEPENDENCY_INSTALL}
2323
matrix:
24-
- DEPENDENCY_MODE=libav ENABLE_COVERAGE=true
25-
- DEPENDENCY_MODE=libav ENABLE_COVERAGE=false
26-
- DEPENDENCY_MODE=ffmpeg ENABLE_COVERAGE=true
27-
- DEPENDENCY_MODE=ffmpeg ENABLE_COVERAGE=false
24+
- DEPENDENCY_NAME=libav DEPENDENCY_VERSION=11.3 ENABLE_COVERAGE=true
25+
- DEPENDENCY_NAME=libav DEPENDENCY_VERSION=11.3 ENABLE_COVERAGE=false
26+
- DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.4.2 ENABLE_COVERAGE=true
27+
- DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.4.2 ENABLE_COVERAGE=false
28+
- DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.5.7 ENABLE_COVERAGE=false
2829

2930
matrix:
30-
# generate coverage only with gcc
3131
exclude:
32+
# generate coverage only with gcc
3233
- compiler: clang
33-
env: DEPENDENCY_MODE=ffmpeg ENABLE_COVERAGE=true
34+
env: DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.4.2 ENABLE_COVERAGE=true
3435
- compiler: clang
35-
env: DEPENDENCY_MODE=libav ENABLE_COVERAGE=true
36-
allow_failures:
36+
env: DEPENDENCY_NAME=libav DEPENDENCY_VERSION=11.3 ENABLE_COVERAGE=true
37+
# generate coverage only on linux
3738
- os: osx
39+
env: DEPENDENCY_NAME=libav DEPENDENCY_VERSION=11.3 ENABLE_COVERAGE=true
40+
- os: osx
41+
env: DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.4.2 ENABLE_COVERAGE=true
3842
fast_finish: true
3943

4044
# This results in a 2×2×2x2 build matrix.
41-
# Where the variables are: os / compiler / DEPENDENCY_MODE / ENABLE_COVERAGE
45+
# Where the variables are: os / compiler / DEPENDENCY_NAME / ENABLE_COVERAGE
46+
47+
# If ENABLE_COVERAGE is True, we push the coverage to coveralls.
48+
# If ENABLE_COVERAGE is False, we push the binaries to github releases.
4249

4350
addons:
4451
apt:
@@ -58,40 +65,42 @@ cache:
5865
- ${DEPENDENCY_INSTALL_PATH}
5966

6067
before_script:
61-
- env | sort
68+
- env | sort
6269
- date -u
6370
- uname -a
6471

6572
- cd ${TRAVIS_BUILD_DIR}
6673

6774
# install coverage tools
68-
- if [ ${ENABLE_COVERAGE} ]; then ./tools/travis.gcc.install.coverage.sh; fi
75+
- if [ ${ENABLE_COVERAGE} ]; then ./tools/travis/gcc.install.coverage.sh; fi
6976

7077
# install avtranscoder dependencies
71-
- if [ ${TRAVIS_OS_NAME} = "linux" ]; then ./tools/travis.linux.install.deps.sh; fi
72-
- if [ ${TRAVIS_OS_NAME} = "osx" ]; then ./tools/travis.osx.install.deps.sh; fi
78+
- if [ ${TRAVIS_OS_NAME} = "linux" ]; then ./tools/travis/linux.install.deps.sh; fi
79+
- if [ ${TRAVIS_OS_NAME} = "osx" ]; then ./tools/travis/osx.install.deps.sh; fi
7380

7481
script:
7582
# build
76-
- ./tools/travis.build.sh
83+
- ./tools/travis/build.sh
7784

7885
# launch tests
79-
- if [ ${DEPENDENCY_MODE} = "ffmpeg" ]; then ./tools/travis.python.nosetests.sh; fi
86+
- if [ ${TRAVIS_OS_NAME} = "linux" ] && [ ${DEPENDENCY_NAME} = "ffmpeg" ]; then ./tools/travis/python.nosetests.sh; fi
8087

8188
after_success:
8289
# generate coverage for coveralls
83-
- if [ ${ENABLE_COVERAGE} ]; then ./tools/travis.gcc.generate.coverage.sh; fi
90+
- if [ ${ENABLE_COVERAGE} ]; then ./tools/travis/gcc.generate.coverage.sh; fi
8491

8592
before_deploy:
93+
# copy libbz2, external dependency of libavformat
94+
- if [ ${TRAVIS_OS_NAME} = "linux" ]; then cp /lib/x86_64-linux-gnu/{libbz2.so.1,libbz2.so.1.0,libbz2.so.1.0.4} ${DEPENDENCY_INSTALL_PATH}/lib; fi
8695
# create archive
8796
- cd ${TRAVIS_BUILD_DIR}
88-
- tar -cvzf avtranscoder-${TRAVIS_OS_NAME}-${CC}-${DEPENDENCY_MODE}.tgz ${DEPENDENCY_INSTALL} ${AVTRANSCODER_INSTALL}
97+
- tar -cvzf avtranscoder-${TRAVIS_OS_NAME}-${CC}-${DEPENDENCY_NAME}-${DEPENDENCY_VERSION}.tgz ${DEPENDENCY_INSTALL} ${AVTRANSCODER_INSTALL}
8998

9099
deploy:
91100
provider: releases
92101
api_key:
93102
secure: ${GITHUB_RELEASE_API_KEY}
94-
file: avtranscoder-${TRAVIS_OS_NAME}-${CC}-${DEPENDENCY_MODE}.tgz
103+
file: avtranscoder-${TRAVIS_OS_NAME}-${CC}-${DEPENDENCY_NAME}-${DEPENDENCY_VERSION}.tgz
95104
skip_cleanup: true
96105
on:
97106
branch: master

‎CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ set(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY TRUE)
1414
# CPP flags on debug / release mode
1515
if(MSVC)
1616
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
17-
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
17+
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT /Ox")
1818
else()
1919
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -fPIC -g")
2020
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wall -fPIC -O3")

‎COPYING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
**avTranscoder** project is published under multi-licensing, so you can choose between:
2-
>* GNU Lesser General Public License, version 3 (**LGPL**), see [LICENSE.LGPL](LICENSE.LGPL) file.
3-
>* GNU General Public License, version 3 (**GPL**), see [LICENSE.GPL](LICENSE.GPL) file.
2+
>* GNU Lesser General Public License, version 2.1 (**LGPL**), see [LICENSE.LGPL](LICENSE.LGPL) file.
3+
>* GNU General Public License, version 2 (**GPL**), see [LICENSE.GPL](LICENSE.GPL) file.
44
55
This multi-licensing scheme applies to the whole project.

‎INSTALL.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ AvTranscoder uses CMake as build system.
44

55
#### Dependencies
66
AvTranscoder can depend on ffmpeg, libav, or any fork of these projects that follow the same API.
7-
* Recommended ffmpeg versions: 2.2.2 or upper
8-
* Recommended libav versions: not tested
7+
* Recommended ffmpeg versions: 2.4.2, 2.4.5, 2.5.7
8+
* Recommended libav versions: 11.3
99

1010
#### To build
1111
```

0 commit comments

Comments
 (0)