remove conflict method

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit cdfe549ccb56 · 2014-07-18T12:01:02.000+02:00
diff --git a/src/AvTranscoder/OptionLoader.hpp b/src/AvTranscoder/OptionLoader.hpp
@@ -74,12 +74,6 @@ class OptionLoader
 	 */
 	static std::vector<std::string> getSampleFormats( const std::string& audioCodecName = "" );
 	
-	/**
-	 *  Get array of sample format supported by an audio codec.
-	 *  @param audioCodecName: the audio codec name (empty if not indicated, and so get all sample formats supported by all audio codecs).
-	 */
-	std::vector<std::string> getSampleFormats( const std::string& audioCodecName = "" ) const;
-	
 private:
 	/**
 	 * @brief: load array of Option depending on the flags.
