From b5b93bbccad9cdea09dbe718035e6447e351694b Mon Sep 17 00:00:00 2001
From: Felipe Ducau <fnd212@nyu.edu>
Date: Wed, 15 Apr 2020 21:58:53 -0300
Subject: [PATCH] Adding parallel frame info

---
 merger/InteractiveMergerSubprocessor.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/merger/InteractiveMergerSubprocessor.py b/merger/InteractiveMergerSubprocessor.py
index bbec108..820718c 100644
--- a/merger/InteractiveMergerSubprocessor.py
+++ b/merger/InteractiveMergerSubprocessor.py
@@ -21,6 +21,7 @@ class InteractiveMergerSubprocessor(Subprocessor):
     class Frame(object):
         def __init__(self, prev_temporal_frame_infos=None,
                            frame_info=None,
+                           parallel_frame_info=None,
                            next_temporal_frame_infos=None):
             self.prev_temporal_frame_infos = prev_temporal_frame_infos
             self.frame_info = frame_info
@@ -570,4 +571,4 @@ class InteractiveMergerSubprocessor(Subprocessor):
 
     #override
     def get_result(self):
-        return 0
\ No newline at end of file
+        return 0