minor changes

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit 586f8549b646 · 2014-05-19T17:03:53.000-04:00
diff --git a/src/AvTranscoder/Description.hpp b/src/AvTranscoder/Description.hpp
@@ -10,6 +10,7 @@ extern "C" {
 }
 
 #include <vector>
+#include <cstring>
 
 std::vector<size_t> getVersion()
 {
@@ -24,26 +25,22 @@ std::vector<size_t> getVersion()
 
 std::vector<std::string> getInputExtensions()
 {
-	av_register_all();  // Warning: should be called only once
+	av_register_all();
 	std::vector<std::string> extensions;
-	AVInputFormat* iFormat = av_iformat_next( NULL );
-	while( iFormat != NULL )
+	AVInputFormat* iFormat = NULL;
+
+	while( ( iFormat = av_iformat_next( iFormat ) ) )
 	{
 		if( iFormat->extensions != NULL )
 		{
-			const char* exts = iFormat->extensions;
-			while( 1 )
+			char* ext = const_cast<char*>( iFormat->extensions );
+
+			while( ext != NULL )
 			{
-				char* saveptr = NULL;
-				char* ext = av_strtok( const_cast<char*>( exts ), ",", &saveptr );
-				if( ! ext || ! saveptr )
-				{
-					break;
-				}
 				extensions.push_back( std::string( ext ) );
+				ext = strtok( NULL, "," );
 			}
 		}
-		iFormat = av_iformat_next( iFormat );
 	}
 	return extensions;
 }
diff --git a/src/AvTranscoder/Metadatas/DataStreamProperties.hpp b/src/AvTranscoder/Metadatas/DataStreamProperties.hpp
@@ -70,7 +70,7 @@ DataProperties dataStreamInfo( AVFormatContext* formatContext, const size_t inde
 	DataProperties dp;
 	dp.streamId = index;
 
-	AVCodecContext* codec_context = formatContext->streams[index]->codec;
+	// AVCodecContext* codec_context = formatContext->streams[index]->codec;
 	
 	// dp.codecName     = codec_context->codec_name;
 	// dp.codecLongName = codec_context->codec_name;

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ extern "C" {`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`#include <vector>`
	`13`	`+#include <cstring>`
`13`	`14`
`14`	`15`	`std::vector<size_t> getVersion()`
`15`	`16`	`{`
`@@ -24,26 +25,22 @@ std::vector<size_t> getVersion()`
`24`	`25`
`25`	`26`	`std::vector<std::string> getInputExtensions()`
`26`	`27`	`{`
`27`		`- av_register_all(); // Warning: should be called only once`
	`28`	`+ av_register_all();`
`28`	`29`	`std::vector<std::string> extensions;`
`29`		`- AVInputFormat* iFormat = av_iformat_next( NULL );`
`30`		`- while( iFormat != NULL )`
	`30`	`+ AVInputFormat* iFormat = NULL;`
	`31`	`+`
	`32`	`+ while( ( iFormat = av_iformat_next( iFormat ) ) )`
`31`	`33`	`{`
`32`	`34`	`if( iFormat->extensions != NULL )`
`33`	`35`	`{`
`34`		`- const char* exts = iFormat->extensions;`
`35`		`- while( 1 )`
	`36`	`+ char* ext = const_cast<char*>( iFormat->extensions );`
	`37`	`+`
	`38`	`+ while( ext != NULL )`
`36`	`39`	`{`
`37`		`- char* saveptr = NULL;`
`38`		`- char* ext = av_strtok( const_cast<char*>( exts ), ",", &saveptr );`
`39`		`- if( ! ext \|\| ! saveptr )`
`40`		`- {`
`41`		`- break;`
`42`		`- }`
`43`	`40`	`extensions.push_back( std::string( ext ) );`
	`41`	`+ ext = strtok( NULL, "," );`
`44`	`42`	`}`
`45`	`43`	`}`
`46`		`- iFormat = av_iformat_next( iFormat );`
`47`	`44`	`}`
`48`	`45`	`return extensions;`
`49`	`46`	`}`