diff --git a/ffplayout/folder.py b/ffplayout/folder.py
index 4e1c6e06..57d60cca 100644
--- a/ffplayout/folder.py
+++ b/ffplayout/folder.py
@@ -186,12 +186,12 @@ class GetSourceFromFolder:
                         'source': self._media.store[0]
                     }
 
-                filtergraph = build_filtergraph(
+                self.node['src_cmd'] = ['-i', self._media.store[self.index]]
+                self.node['filter'] = build_filtergraph(
                     self.node, self.node_last, self.node_next, duration,
                     0.0, duration, self.probe)
 
-                yield ['-i', self._media.store[self.index]] + filtergraph, \
-                    self.node
+                yield self.node
                 self.index += 1
                 self.node_last = deepcopy(self.node)
             else:
diff --git a/ffplayout/output/desktop.py b/ffplayout/output/desktop.py
index 7312e877..2fbad806 100644
--- a/ffplayout/output/desktop.py
+++ b/ffplayout/output/desktop.py
@@ -60,7 +60,7 @@ def output():
             get_source = GetSourceFromFolder(media)
 
         try:
-            for src_cmd, node in get_source.next():
+            for node in get_source.next():
                 if watcher is not None:
                     watcher.current_clip = node.get('source')
 
@@ -68,7 +68,7 @@ def output():
 
                 dec_cmd = ['ffmpeg', '-v', _log.ff_level.lower(),
                            '-hide_banner', '-nostats'
-                           ] + src_cmd + ff_pre_settings
+                           ] + node['src_cmd'] + ff_pre_settings
 
                 messenger.debug(f'Decoder CMD: "{" ".join(dec_cmd)}"')
 
diff --git a/ffplayout/output/hls.py b/ffplayout/output/hls.py
index 1e4f6c0e..717c9790 100644
--- a/ffplayout/output/hls.py
+++ b/ffplayout/output/hls.py
@@ -54,7 +54,7 @@ def output():
             get_source = GetSourceFromFolder(media)
 
         try:
-            for src_cmd, node in get_source.next():
+            for node in get_source.next():
                 if watcher is not None:
                     watcher.current_clip = node.get('source')
 
@@ -63,7 +63,7 @@ def output():
                 cmd = [
                     'ffmpeg', '-v', _log.ff_level.lower(), '-hide_banner',
                     '-nostats'
-                    ] + src_cmd + [
+                    ] + node['src_cmd'] + [
                         '-metadata', 'service_name=' + _playout.name,
                         '-metadata', 'service_provider=' + _playout.provider,
                         '-metadata', 'year={}'.format(year)
diff --git a/ffplayout/output/stream.py b/ffplayout/output/stream.py
index c164a359..a2d26537 100644
--- a/ffplayout/output/stream.py
+++ b/ffplayout/output/stream.py
@@ -67,7 +67,7 @@ def output():
             get_source = GetSourceFromFolder(media)
 
         try:
-            for src_cmd, node in get_source.next():
+            for node in get_source.next():
                 if watcher is not None:
                     watcher.current_clip = node.get('source')
 
@@ -75,7 +75,7 @@ def output():
 
                 dec_cmd = ['ffmpeg', '-v', _log.ff_level.lower(),
                            '-hide_banner', '-nostats'
-                           ] + src_cmd + ff_pre_settings
+                           ] + node['src_cmd'] + ff_pre_settings
 
                 messenger.debug(f'Decoder CMD: "{" ".join(dec_cmd)}"')