Merge branch 'develop' of https://github.com/avTranscoder/avTranscoder into dev_transcoderRewrapToMultiChannels

Clement Champetier · Clement Champetier · commit c8bc9888039f · 2016-07-19T10:10:30.000+02:00
Conflicts:
	test/pyTest/testEProcessMethod.py
diff --git a/test/pyTest/testEProcessMethod.py b/test/pyTest/testEProcessMethod.py
@@ -28,7 +28,7 @@ def testEProcessMethodShortest():
     transcoder.setProcessMethod( av.eProcessMethodShortest )
 
     transcoder.addStream( av.InputStreamDesc(inputFileName_longest, 0) )
-    transcoder.addStream( av.InputStreamDesc(inputFileName_shortest, 0) )
+    transcoder.addStream( av.InputStreamDesc(inputFileName_shortest, 1) )
 
     progress = av.ConsoleProgress()
     transcoder.process( progress )
