Merge pull request #173 from cchampet/fix_mediaPropertyMetadataInDouble

valnoel · valnoel · commit 466d5569d3e6 · 2015-04-23T15:32:08.000+02:00
mediaProperty: fix metadata were loaded twice for video/audio properties
diff --git a/src/AvTranscoder/mediaProperty/AudioProperties.cpp b/src/AvTranscoder/mediaProperty/AudioProperties.cpp
@@ -21,9 +21,6 @@ AudioProperties::AudioProperties( const FormatContext& formatContext, const size
 
 	if( _formatContext && _codecContext )
 		_codec = avcodec_find_decoder( _codecContext->codec_id );
-
-	if( _formatContext )
-		detail::fillMetadataDictionnary( _formatContext->streams[index]->metadata, _metadatas );
 }
 
 size_t AudioProperties::getStreamId() const
diff --git a/src/AvTranscoder/mediaProperty/VideoProperties.cpp b/src/AvTranscoder/mediaProperty/VideoProperties.cpp
@@ -37,9 +37,6 @@ VideoProperties::VideoProperties( const FormatContext& formatContext, const size
 
 	if( _formatContext && _codecContext )
 		_codec = avcodec_find_decoder( _codecContext->codec_id );
-	
-	if( _formatContext )
-		detail::fillMetadataDictionnary( _formatContext->streams[index]->metadata, _metadatas );
 
 	if( _codecContext )
 		_pixelProperties = PixelProperties( _codecContext->pix_fmt );

Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,6 @@ AudioProperties::AudioProperties( const FormatContext& formatContext, const size`
`21`	`21`
`22`	`22`	`if( _formatContext && _codecContext )`
`23`	`23`	`_codec = avcodec_find_decoder( _codecContext->codec_id );`
`24`		`-`
`25`		`- if( _formatContext )`
`26`		`- detail::fillMetadataDictionnary( _formatContext->streams[index]->metadata, _metadatas );`
`27`	`24`	`}`
`28`	`25`
`29`	`26`	`size_t AudioProperties::getStreamId() const`