Merge branch 'hotfix/v0.6.1' into develop

Clement Champetier · Clement Champetier · commit 54043f7b7126 · 2015-12-17T16:54:42.000+01:00
Conflicts:
	src/AvTranscoder/transcoder/StreamTranscoder.hpp
	src/AvTranscoder/transcoder/Transcoder.cpp
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.hpp b/src/AvTranscoder/transcoder/StreamTranscoder.hpp
@@ -80,7 +80,7 @@ class AvExport StreamTranscoder
     ITransform& getTransform() const { return *_transform; }
 
     /// Returns a reference to the stream which unwraps data
-    IInputStream& getInputStream() const { return *_inputStream; }
+    IInputStream* getInputStream() const { return _inputStream; }
     /// Returns a reference to the stream which wraps data
     IOutputStream& getOutputStream() const { return *_outputStream; }
 
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -563,7 +563,12 @@ void Transcoder::fillProcessStat(ProcessStat& processStat)
     for(size_t streamIndex = 0; streamIndex < _streamTranscoders.size(); ++streamIndex)
     {
         IOutputStream& stream = _streamTranscoders.at(streamIndex)->getOutputStream();
-        const AVMediaType mediaType = _streamTranscoders.at(streamIndex)->getInputStream().getProperties().getStreamType();
+        const IInputStream* inputStream = _streamTranscoders.at( streamIndex )->getInputStream();
+        if(inputStream == NULL) {
+            LOG_WARN( "Cannot process statistics of generated stream." )
+            continue;
+        }
+        const AVMediaType mediaType = inputStream->getProperties().getStreamType();
         switch(mediaType)
         {
             case AVMEDIA_TYPE_VIDEO:

Original file line number	Diff line number	Diff line change
`@@ -563,7 +563,12 @@ void Transcoder::fillProcessStat(ProcessStat& processStat)`
`563`	`563`	`for(size_t streamIndex = 0; streamIndex < _streamTranscoders.size(); ++streamIndex)`
`564`	`564`	`{`
`565`	`565`	`IOutputStream& stream = _streamTranscoders.at(streamIndex)->getOutputStream();`
`566`		`- const AVMediaType mediaType = _streamTranscoders.at(streamIndex)->getInputStream().getProperties().getStreamType();`
	`566`	`+ const IInputStream* inputStream = _streamTranscoders.at( streamIndex )->getInputStream();`
	`567`	`+ if(inputStream == NULL) {`
	`568`	`+ LOG_WARN( "Cannot process statistics of generated stream." )`
	`569`	`+ continue;`
	`570`	`+ }`
	`571`	`+ const AVMediaType mediaType = inputStream->getProperties().getStreamType();`
`567`	`572`	`switch(mediaType)`
`568`	`573`	`{`
`569`	`574`	`case AVMEDIA_TYPE_VIDEO:`