Skip to content

Commit d46352e

Browse files
author
Clement Champetier
committed
Merge branch 'develop' of https://github.com/avTranscoder/avTranscoder into fix_travisMacOSXBuild
Conflicts: .travis.yml
2 parents 0ffd508 + 54043f7 commit d46352e

File tree

121 files changed

+7418
-7410
lines changed

Some content is hidden

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

121 files changed

+7418
-7410
lines changed

‎.travis.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,22 +68,22 @@ before_script:
6868
- cd ${TRAVIS_BUILD_DIR}
6969

7070
# install coverage tools
71-
- if [ ${ENABLE_COVERAGE} ]; then ./tools/travis.gcc.install.coverage.sh; fi
71+
- if [ ${ENABLE_COVERAGE} ]; then ./tools/travis/gcc.install.coverage.sh; fi
7272

7373
# install avtranscoder dependencies
74-
- if [ ${TRAVIS_OS_NAME} = "linux" ]; then ./tools/travis.linux.install.deps.sh; fi
75-
- if [ ${TRAVIS_OS_NAME} = "osx" ]; then ./tools/travis.osx.install.deps.sh; fi
74+
- if [ ${TRAVIS_OS_NAME} = "linux" ]; then ./tools/travis/linux.install.deps.sh; fi
75+
- if [ ${TRAVIS_OS_NAME} = "osx" ]; then ./tools/travis/osx.install.deps.sh; fi
7676

7777
script:
7878
# build
79-
- ./tools/travis.build.sh
79+
- ./tools/travis/build.sh
8080

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

8484
after_success:
8585
# generate coverage for coveralls
86-
- if [ ${ENABLE_COVERAGE} ]; then ./tools/travis.gcc.generate.coverage.sh; fi
86+
- if [ ${ENABLE_COVERAGE} ]; then ./tools/travis/gcc.generate.coverage.sh; fi
8787

8888
before_deploy:
8989
# copy libbz2, external dependency of libavformat

‎README.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ Based on Libav/FFmpeg libraries to support various video and audio formats, avTr
77
[![Build Status](https://travis-ci.org/avTranscoder/avTranscoder.svg?branch=develop)](https://travis-ci.org/avTranscoder/avTranscoder)
88
[![Coverage Status](https://coveralls.io/repos/avTranscoder/avTranscoder/badge.svg)](https://coveralls.io/r/avTranscoder/avTranscoder)
99
<a href="https://scan.coverity.com/projects/2626"><img alt="Coverity Scan Build Status" src="https://scan.coverity.com/projects/2626/badge.svg"/></a>
10+
[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/avTranscoder/avtranscoder/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
11+
12+
[![Stories in Progress](https://badge.waffle.io/avTranscoder/avTranscoder.svg?label=2 - Working&title=In Progress)](http://waffle.io/avTranscoder/avTranscoder)
13+
Click on the badge above to have a big picture view of what's in progress and how you can help.
1014

1115
#### What you need to know
1216
* C++ library
@@ -47,8 +51,3 @@ Note: for continuous integration, we launch tests with media files contained in
4751

4852
###### Build openSUSE
4953
comming soon
50-
51-
52-
53-
[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/avTranscoder/avtranscoder/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
54-

‎app/avInfo/avInfo.cpp

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,32 @@
44

55
#include <AvTranscoder/Library.hpp>
66

7-
int main( int argc, char** argv )
7+
int main(int argc, char** argv)
88
{
9-
avtranscoder::Libraries libs( avtranscoder::getLibraries() );
9+
avtranscoder::Libraries libs(avtranscoder::getLibraries());
1010

11-
for( avtranscoder::Libraries::iterator library = libs.begin(); library != libs.end(); ++library )
12-
{
13-
std::cout << std::left;
14-
std::cout << std::setw( 15 ) << (*library).getName();
15-
std::cout << std::setw( 10 ) << (*library).getStringVersion();
16-
std::cout << std::setw( 30 ) << (*library).getLicense();
17-
std::cout << std::endl;
18-
}
11+
for(avtranscoder::Libraries::iterator library = libs.begin(); library != libs.end(); ++library)
12+
{
13+
std::cout << std::left;
14+
std::cout << std::setw(15) << (*library).getName();
15+
std::cout << std::setw(10) << (*library).getStringVersion();
16+
std::cout << std::setw(30) << (*library).getLicense();
17+
std::cout << std::endl;
18+
}
1919

20-
avtranscoder::preloadCodecsAndFormats();
20+
avtranscoder::preloadCodecsAndFormats();
2121

22-
std::vector<std::string> inputExtension = avtranscoder::getInputExtensions();
23-
std::vector<std::string> outputExtension = avtranscoder::getOutputExtensions();
24-
25-
std::cout << "Supported input extensions: " << inputExtension.size() << std::endl;
26-
for( std::vector<std::string>::iterator it = inputExtension.begin(); it != inputExtension.end(); ++it )
27-
std::cout << *it << ", ";;
28-
29-
std::cout << std::endl << std::endl << "Supported output extensions: " << outputExtension.size() << std::endl;
30-
for( std::vector<std::string>::iterator it = outputExtension.begin(); it != outputExtension.end(); ++it )
31-
std::cout << *it << ", ";
32-
std::cout << std::endl;
33-
return 0;
22+
std::vector<std::string> inputExtension = avtranscoder::getInputExtensions();
23+
std::vector<std::string> outputExtension = avtranscoder::getOutputExtensions();
24+
25+
std::cout << "Supported input extensions: " << inputExtension.size() << std::endl;
26+
for(std::vector<std::string>::iterator it = inputExtension.begin(); it != inputExtension.end(); ++it)
27+
std::cout << *it << ", ";
28+
;
29+
30+
std::cout << std::endl << std::endl << "Supported output extensions: " << outputExtension.size() << std::endl;
31+
for(std::vector<std::string>::iterator it = outputExtension.begin(); it != outputExtension.end(); ++it)
32+
std::cout << *it << ", ";
33+
std::cout << std::endl;
34+
return 0;
3435
}

‎app/avMeta/avMeta.cpp

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -5,52 +5,52 @@
55

66
#include <iostream>
77

8-
int main( int argc, char** argv )
8+
int main(int argc, char** argv)
99
{
10-
bool toJson = false;
11-
12-
std::string help;
13-
help += "Usage\n";
14-
help += "\tavmeta INPUT_FILE [--json][--help]\n";
15-
help += "Command line options\n";
16-
help += "\t--json: print properties as json\n";
17-
18-
if( argc < 2 )
19-
{
20-
std::cout << help << std::endl;
21-
return( 1 );
22-
}
23-
24-
// List command line arguments
25-
std::vector< std::string > arguments;
26-
for( int argument = 1; argument < argc; ++argument )
27-
{
28-
arguments.push_back( argv[argument] );
29-
}
30-
for( size_t argument = 0; argument < arguments.size(); ++argument )
31-
{
32-
if( arguments.at( argument ) == "--help" )
33-
{
34-
std::cout << help << std::endl;
35-
return 0;
36-
}
37-
else if( arguments.at( argument ) == "--json" )
38-
{
39-
toJson = true;
40-
}
41-
}
42-
43-
avtranscoder::preloadCodecsAndFormats();
44-
avtranscoder::Logger::setLogLevel( AV_LOG_QUIET );
45-
46-
// analyse inputFile
47-
avtranscoder::InputFile input( argv[1] );
48-
avtranscoder::NoDisplayProgress p;
49-
input.analyse( p, avtranscoder::eAnalyseLevelFirstGop );
50-
51-
// display file properties
52-
if( toJson )
53-
std::cout << input.getProperties().allPropertiesAsJson() << std::endl;
54-
else
55-
std::cout << input;
10+
bool toJson = false;
11+
12+
std::string help;
13+
help += "Usage\n";
14+
help += "\tavmeta INPUT_FILE [--json][--help]\n";
15+
help += "Command line options\n";
16+
help += "\t--json: print properties as json\n";
17+
18+
if(argc < 2)
19+
{
20+
std::cout << help << std::endl;
21+
return (1);
22+
}
23+
24+
// List command line arguments
25+
std::vector<std::string> arguments;
26+
for(int argument = 1; argument < argc; ++argument)
27+
{
28+
arguments.push_back(argv[argument]);
29+
}
30+
for(size_t argument = 0; argument < arguments.size(); ++argument)
31+
{
32+
if(arguments.at(argument) == "--help")
33+
{
34+
std::cout << help << std::endl;
35+
return 0;
36+
}
37+
else if(arguments.at(argument) == "--json")
38+
{
39+
toJson = true;
40+
}
41+
}
42+
43+
avtranscoder::preloadCodecsAndFormats();
44+
avtranscoder::Logger::setLogLevel(AV_LOG_QUIET);
45+
46+
// analyse inputFile
47+
avtranscoder::InputFile input(argv[1]);
48+
avtranscoder::NoDisplayProgress p;
49+
input.analyse(p, avtranscoder::eAnalyseLevelFirstGop);
50+
51+
// display file properties
52+
if(toJson)
53+
std::cout << input.getProperties().allPropertiesAsJson() << std::endl;
54+
else
55+
std::cout << input;
5656
}

0 commit comments

Comments
 (0)