util: removed matchFormat method

Clement Champetier · Clement Champetier · commit 981e7c7b67d2 · 2016-03-09T18:05:08.000+01:00
Used only once, inside OutputFile class.
diff --git a/src/AvTranscoder/file/OutputFile.cpp b/src/AvTranscoder/file/OutputFile.cpp
@@ -266,7 +266,7 @@ void OutputFile::setupWrapping(const ProfileLoader::Profile& profile)
     }
 
     // check if output format indicated is valid with the filename extension
-    if(!matchFormat(profile.find(constants::avProfileFormat)->second, getFilename()))
+    if(!av_guess_format(profile.find(constants::avProfileFormat)->second.c_str(), getFilename().c_str(), NULL))
     {
         throw std::runtime_error("Invalid format according to the file extension.");
     }
diff --git a/src/AvTranscoder/util.cpp b/src/AvTranscoder/util.cpp
@@ -12,12 +12,6 @@ extern "C" {
 namespace avtranscoder
 {
 
-bool matchFormat(const std::string& format, const std::string& filename)
-{
-    AVOutputFormat* avOutputFormat = av_guess_format(format.c_str(), filename.c_str(), NULL);
-    return avOutputFormat != NULL;
-}
-
 std::vector<std::string> getSupportedPixelFormats(const std::string& videoCodecName)
 {
     std::vector<std::string> pixelFormats;
diff --git a/src/AvTranscoder/util.hpp b/src/AvTranscoder/util.hpp
@@ -19,11 +19,6 @@ namespace avtranscoder
 typedef std::map<std::string, OptionArray> OptionArrayMap;
 typedef std::map<std::string, std::string> NamesArray; //< short/long names of format/video codec/audio codec
 
-/**
- * @brief Check if a format name corresponds to the format of a given filename
- */
-bool AvExport matchFormat(const std::string& format, const std::string& filename);
-
 /**
 *  @brief Get pixel format supported by a video codec.
 *  @param videoCodecName: the video codec name (empty if not indicated, and so get all pixel formats supported by all video

Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,7 @@ void OutputFile::setupWrapping(const ProfileLoader::Profile& profile)`
`266`	`266`	`}`
`267`	`267`
`268`	`268`	`// check if output format indicated is valid with the filename extension`
`269`		`- if(!matchFormat(profile.find(constants::avProfileFormat)->second, getFilename()))`
	`269`	`+ if(!av_guess_format(profile.find(constants::avProfileFormat)->second.c_str(), getFilename().c_str(), NULL))`
`270`	`270`	`{`
`271`	`271`	`throw std::runtime_error("Invalid format according to the file extension.");`
`272`	`272`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,12 +12,6 @@ extern "C" {`
`12`	`12`	`namespace avtranscoder`
`13`	`13`	`{`
`14`	`14`
`15`		`-bool matchFormat(const std::string& format, const std::string& filename)`
`16`		`-{`
`17`		`- AVOutputFormat* avOutputFormat = av_guess_format(format.c_str(), filename.c_str(), NULL);`
`18`		`- return avOutputFormat != NULL;`
`19`		`-}`
`20`		`-`
`21`	`15`	`std::vector<std::string> getSupportedPixelFormats(const std::string& videoCodecName)`
`22`	`16`	`{`
`23`	`17`	`std::vector<std::string> pixelFormats;`