From f9e701c56660c37d109a51909bf4f3fe7628d1bc Mon Sep 17 00:00:00 2001
From: Nicolas Pope <nwpope@utu.fi>
Date: Thu, 3 Sep 2020 17:46:28 +0300
Subject: [PATCH] Allow frameset selection in mkv convertor

---
 .gitlab-ci.yml                    | 2 +-
 applications/ftl2mkv/src/main.cpp | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2fb74df06..06dbbeb60 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,7 +54,7 @@ webserver-deploy:
 ### Windows
 
 .build-windows: &build-windows
-    - 'call vcvars64.bat'
+    - call vcvars64.bat
     - mkdir build
     - cd build
     - cmake %CMAKE_ARGS% %CMAKE_ARGS_WINDOWS% -DREALSENSE_DIR="C:/Program Files (x86)/Intel RealSense SDK 2.0" -DOPENVR_DIR="C:/Program Files (x86)/OpenVRSDK" -DOPUS_DIR="C:/Program Files (x86)/Opus" ..
diff --git a/applications/ftl2mkv/src/main.cpp b/applications/ftl2mkv/src/main.cpp
index 244ff02e5..95ad6cc98 100644
--- a/applications/ftl2mkv/src/main.cpp
+++ b/applications/ftl2mkv/src/main.cpp
@@ -178,6 +178,7 @@ int main(int argc, char **argv) {
 	// TODO: In future, find a better way to discover number of streams...
 	// Read entire file to find all streams before reading again to write data
 	bool res = r.read(90000000000000, [&current_stream,&current_channel,&r,&video_st,oc,&mapping,&stream_count](const ftl::codecs::StreamPacket &spkt, const ftl::codecs::Packet &pkt) {
+		if (current_stream != 255 && spkt.streamID != current_stream) return;
 		if (spkt.channel != Channel::Colour && spkt.channel != Channel::Right) return;
 
         //if (spkt.channel != static_cast<ftl::codecs::Channel>(current_channel) && current_channel != -1) return;
-- 
GitLab