avTranscoder · valnoel · Dec 15, 2015 · Dec 7, 2015 · Dec 7, 2015 · Dec 15, 2015
diff --git a/.travis.yml b/.travis.yml
@@ -65,22 +65,22 @@ before_script:
   - cd ${TRAVIS_BUILD_DIR}
 
   # install coverage tools
-  - if [ ${ENABLE_COVERAGE} ]; then ./tools/travis.gcc.install.coverage.sh; fi
+  - if [ ${ENABLE_COVERAGE} ]; then ./tools/travis/gcc.install.coverage.sh; fi
 
   # install avtranscoder dependencies
-  - if [ ${TRAVIS_OS_NAME} = "linux" ]; then ./tools/travis.linux.install.deps.sh; fi
-  - if [ ${TRAVIS_OS_NAME} = "osx" ]; then ./tools/travis.osx.install.deps.sh; fi
+  - if [ ${TRAVIS_OS_NAME} = "linux" ]; then ./tools/travis/linux.install.deps.sh; fi
+  - if [ ${TRAVIS_OS_NAME} = "osx" ]; then ./tools/travis/osx.install.deps.sh; fi
 
 script:
   # build
-  - ./tools/travis.build.sh
+  - ./tools/travis/build.sh
 
   # launch tests
-  - if [ ${DEPENDENCY_MODE} = "ffmpeg" ]; then ./tools/travis.python.nosetests.sh; fi
+  - if [ ${DEPENDENCY_MODE} = "ffmpeg" ]; then ./tools/travis/python.nosetests.sh; fi
 
 after_success:
   # generate coverage for coveralls
-  - if [ ${ENABLE_COVERAGE} ]; then ./tools/travis.gcc.generate.coverage.sh; fi
+  - if [ ${ENABLE_COVERAGE} ]; then ./tools/travis/gcc.generate.coverage.sh; fi
 
 before_deploy:
   # copy libbz2, external dependency of libavformat

diff --git a/app/avInfo/avInfo.cpp b/app/avInfo/avInfo.cpp
@@ -4,31 +4,32 @@
 
 #include <AvTranscoder/Library.hpp>
 
-int main( int argc, char** argv )
+int main(int argc, char** argv)
 {
-	avtranscoder::Libraries libs( avtranscoder::getLibraries() );
+    avtranscoder::Libraries libs(avtranscoder::getLibraries());
 
-	for( avtranscoder::Libraries::iterator library = libs.begin(); library != libs.end(); ++library )
-	{
-		std::cout << std::left;
-		std::cout << std::setw( 15 ) << (*library).getName();
-		std::cout << std::setw( 10 ) << (*library).getStringVersion();
-		std::cout << std::setw( 30 ) << (*library).getLicense();
-		std::cout << std::endl;
-	}
+    for(avtranscoder::Libraries::iterator library = libs.begin(); library != libs.end(); ++library)
+    {
+        std::cout << std::left;
+        std::cout << std::setw(15) << (*library).getName();
+        std::cout << std::setw(10) << (*library).getStringVersion();
+        std::cout << std::setw(30) << (*library).getLicense();
+        std::cout << std::endl;
+    }
 
-	avtranscoder::preloadCodecsAndFormats();
+    avtranscoder::preloadCodecsAndFormats();
 
-	std::vector<std::string> inputExtension  = avtranscoder::getInputExtensions();
-	std::vector<std::string> outputExtension = avtranscoder::getOutputExtensions();
-
-	std::cout << "Supported input extensions: " << inputExtension.size() << std::endl;
-	for( std::vector<std::string>::iterator it = inputExtension.begin(); it != inputExtension.end(); ++it )
-		std::cout << *it << ", ";;
-
-	std::cout << std::endl << std::endl << "Supported output extensions: " << outputExtension.size() << std::endl;
-	for( std::vector<std::string>::iterator it = outputExtension.begin(); it != outputExtension.end(); ++it )
-		std::cout << *it << ", ";
-	std::cout << std::endl;
-	return 0;
+    std::vector<std::string> inputExtension = avtranscoder::getInputExtensions();
+    std::vector<std::string> outputExtension = avtranscoder::getOutputExtensions();
+
+    std::cout << "Supported input extensions: " << inputExtension.size() << std::endl;
+    for(std::vector<std::string>::iterator it = inputExtension.begin(); it != inputExtension.end(); ++it)
+        std::cout << *it << ", ";
+    ;
+
+    std::cout << std::endl << std::endl << "Supported output extensions: " << outputExtension.size() << std::endl;
+    for(std::vector<std::string>::iterator it = outputExtension.begin(); it != outputExtension.end(); ++it)
+        std::cout << *it << ", ";
+    std::cout << std::endl;
+    return 0;
 }
diff --git a/app/avMeta/avMeta.cpp b/app/avMeta/avMeta.cpp
@@ -5,52 +5,52 @@
 
 #include <iostream>
 
-int main( int argc, char** argv )
+int main(int argc, char** argv)
 {
-	bool toJson = false;
-
-	std::string help;
-	help += "Usage\n";
-	help += "\tavmeta INPUT_FILE [--json][--help]\n";
-	help += "Command line options\n";
-	help += "\t--json: print properties as json\n";
-
-	if( argc < 2 )
-	{
-		std::cout << help << std::endl;
-		return( 1 );
-	}
-
-	// List command line arguments
-	std::vector< std::string > arguments;
-	for( int argument = 1; argument < argc; ++argument )
-	{
-		arguments.push_back( argv[argument] );
-	}
-	for( size_t argument = 0; argument < arguments.size(); ++argument )
-	{
-		if( arguments.at( argument ) == "--help" )
-		{
-			std::cout << help << std::endl;
-			return 0;
-		}
-		else if( arguments.at( argument ) == "--json" )
-		{
-			toJson = true;
-		}
-	}
-
-	avtranscoder::preloadCodecsAndFormats();
-	avtranscoder::Logger::setLogLevel( AV_LOG_QUIET );
-
-	// analyse inputFile
-	avtranscoder::InputFile input( argv[1] );
-	avtranscoder::NoDisplayProgress p;
-	input.analyse( p, avtranscoder::eAnalyseLevelFirstGop );
-
-	// display file properties
-	if( toJson )
-		std::cout << input.getProperties().allPropertiesAsJson() << std::endl;
-	else
-		std::cout << input;
+    bool toJson = false;
+
+    std::string help;
+    help += "Usage\n";
+    help += "\tavmeta INPUT_FILE [--json][--help]\n";
+    help += "Command line options\n";
+    help += "\t--json: print properties as json\n";
+
+    if(argc < 2)
+    {
+        std::cout << help << std::endl;
+        return (1);
+    }
+
+    // List command line arguments
+    std::vector<std::string> arguments;
+    for(int argument = 1; argument < argc; ++argument)
+    {
+        arguments.push_back(argv[argument]);
+    }
+    for(size_t argument = 0; argument < arguments.size(); ++argument)
+    {
+        if(arguments.at(argument) == "--help")
+        {
+            std::cout << help << std::endl;
+            return 0;
+        }
+        else if(arguments.at(argument) == "--json")
+        {
+            toJson = true;
+        }
+    }
+
+    avtranscoder::preloadCodecsAndFormats();
+    avtranscoder::Logger::setLogLevel(AV_LOG_QUIET);
+
+    // analyse inputFile
+    avtranscoder::InputFile input(argv[1]);
+    avtranscoder::NoDisplayProgress p;
+    input.analyse(p, avtranscoder::eAnalyseLevelFirstGop);
+
+    // display file properties
+    if(toJson)
+        std::cout << input.getProperties().allPropertiesAsJson() << std::endl;
+    else
+        std::cout << input;
 }