From 384836635f91d180f8e4fa0f2335161e3cdec71b Mon Sep 17 00:00:00 2001
From: Thulinma <jaron@vietors.com>
Date: Wed, 16 May 2018 11:11:37 +0200
Subject: [PATCH 1/2] *-exec: inputs now correctly throw away stderr,
 preventing ffmpeg lockups

---
 src/input/input_h264.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/input/input_h264.cpp b/src/input/input_h264.cpp
index 87f149be..bf950959 100644
--- a/src/input/input_h264.cpp
+++ b/src/input/input_h264.cpp
@@ -42,8 +42,8 @@ namespace Mist{
       }
       args[argCnt] = 0;
 
-      int fin = -1, fout = -1, ferr = -1;
-      inputProcess = Util::Procs::StartPiped(args, &fin, &fout, &ferr);
+      int fin = -1, fout = -1;
+      inputProcess = Util::Procs::StartPiped(args, &fin, &fout, 0);
       myConn = Socket::Connection(-1, fout);
     }else{
       myConn = Socket::Connection(fileno(stdout), fileno(stdin));

From bc64ad647f2542b5bc41c23b9ce721d7d126fcf2 Mon Sep 17 00:00:00 2001
From: Thulinma <jaron@vietors.com>
Date: Wed, 16 May 2018 11:12:39 +0200
Subject: [PATCH 2/2] Fix in RAX library

---
 lib/util.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/util.cpp b/lib/util.cpp
index 5e2106ab..4176459c 100644
--- a/lib/util.cpp
+++ b/lib/util.cpp
@@ -460,9 +460,9 @@ namespace Util{
   /// For other types, returns the maximum size possible.
   /// Returns 0 if the field does not exist.
   uint32_t RelAccX::getSize(const std::string &name, uint64_t recordNo) const{
-    if (!fields.count(name) || !isRecordAvailable(recordNo)){return 0;}
     const RelAccXFieldData &fd = fields.at(name);
     if ((fd.type & 0xF0) == RAX_STRING){
+      if (!fields.count(name) || !isRecordAvailable(recordNo)){return 0;}
       return strnlen(RECORD_POINTER, fd.size);
     }else{
       return fd.size;