return virtual class, not specific to correct overloading

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit 55a96d35830c · 2014-07-03T05:26:35.000-04:00
diff --git a/src/AvTranscoder/File/OutputFile.cpp b/src/AvTranscoder/File/OutputFile.cpp
@@ -59,7 +59,7 @@ bool OutputFile::setup()
 	return _formatContext != NULL;
 }
 
-AvOutputStream& OutputFile::addVideoStream( const VideoDesc& videoDesc )
+OutputStream& OutputFile::addVideoStream( const VideoDesc& videoDesc )
 {
 	assert( _formatContext != NULL );
 
@@ -93,7 +93,7 @@ AvOutputStream& OutputFile::addVideoStream( const VideoDesc& videoDesc )
 	return *_outputStreams.back();
 }
 
-AvOutputStream& OutputFile::addAudioStream( const AudioDesc& audioDesc )
+OutputStream& OutputFile::addAudioStream( const AudioDesc& audioDesc )
 {
 	assert( _formatContext != NULL );
 
@@ -112,7 +112,7 @@ AvOutputStream& OutputFile::addAudioStream( const AudioDesc& audioDesc )
 	return *_outputStreams.back();
 }
 
-AvOutputStream& OutputFile::getStream( const size_t streamId )
+OutputStream& OutputFile::getStream( const size_t streamId )
 {
 	if( streamId >= _outputStreams.size() )
 		throw std::runtime_error( "unable to get output stream (out of range)" );
diff --git a/src/AvTranscoder/File/OutputFile.hpp b/src/AvTranscoder/File/OutputFile.hpp
@@ -47,21 +47,21 @@ class AvExport OutputFile
 	 * @note call setup() before adding any stream
 	 * @param videoDesc description of output stream
 	**/
-	virtual AvOutputStream& addVideoStream( const VideoDesc& videoDesc );
+	virtual OutputStream& addVideoStream( const VideoDesc& videoDesc );
 
 	/**
 	 * @brief Add an audio output stream using the description.
 	 * @note call setup() before adding any stream
 	 * @param audioDesc description of output stream
 	**/
-	virtual AvOutputStream& addAudioStream( const AudioDesc& audioDesc );
+	virtual OutputStream& addAudioStream( const AudioDesc& audioDesc );
 
 	/**
 	 * @brief get the output stream description.
 	 * @param streamId select the output stream
 	 * @return the output stream reference
 	**/
-	virtual AvOutputStream& getStream( const size_t streamId );
+	virtual OutputStream& getStream( const size_t streamId );
 
 	/**
 	 * @brief Initialise the wrapping

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ bool OutputFile::setup()`
`59`	`59`	`return _formatContext != NULL;`
`60`	`60`	`}`
`61`	`61`
`62`		`-AvOutputStream& OutputFile::addVideoStream( const VideoDesc& videoDesc )`
	`62`	`+OutputStream& OutputFile::addVideoStream( const VideoDesc& videoDesc )`
`63`	`63`	`{`
`64`	`64`	`assert( _formatContext != NULL );`
`65`	`65`
`@@ -93,7 +93,7 @@ AvOutputStream& OutputFile::addVideoStream( const VideoDesc& videoDesc )`
`93`	`93`	`return *_outputStreams.back();`
`94`	`94`	`}`
`95`	`95`
`96`		`-AvOutputStream& OutputFile::addAudioStream( const AudioDesc& audioDesc )`
	`96`	`+OutputStream& OutputFile::addAudioStream( const AudioDesc& audioDesc )`
`97`	`97`	`{`
`98`	`98`	`assert( _formatContext != NULL );`
`99`	`99`
`@@ -112,7 +112,7 @@ AvOutputStream& OutputFile::addAudioStream( const AudioDesc& audioDesc )`
`112`	`112`	`return *_outputStreams.back();`
`113`	`113`	`}`
`114`	`114`
`115`		`-AvOutputStream& OutputFile::getStream( const size_t streamId )`
	`115`	`+OutputStream& OutputFile::getStream( const size_t streamId )`
`116`	`116`	`{`
`117`	`117`	`if( streamId >= _outputStreams.size() )`
`118`	`118`	`throw std::runtime_error( "unable to get output stream (out of range)" );`