From 371f5dbc0065c469575cd0d6fbf4851e88718628 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Wed, 25 Apr 2018 09:37:04 -0400
Subject: [PATCH 1/2] a zero duration will lead to a non-monotonic
 non-incrementing pts, so we have to use 1 instead.

---
 src/zm_videostore.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zm_videostore.cpp b/src/zm_videostore.cpp
index 9c6d1ca21..3209ceab9 100644
--- a/src/zm_videostore.cpp
+++ b/src/zm_videostore.cpp
@@ -722,7 +722,7 @@ int VideoStore::writeVideoFramePacket(AVPacket *ipkt) {
         ipkt->pts,
         video_last_pts,
         duration);
-    if (duration < 0) {
+    if (duration <= 0) {
       duration = ipkt->duration ? ipkt->duration : av_rescale_q(1,video_in_stream->time_base, video_out_stream->time_base);
     }
   }

From 433cffcce7050adeb7a9f71504925f8ffaca78dd Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Mon, 30 Apr 2018 15:21:05 -0400
Subject: [PATCH 2/2] include Id in Filter dropdown

---
 web/skins/classic/views/filter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/skins/classic/views/filter.php b/web/skins/classic/views/filter.php
index 2f82fcd49..26e1aa42e 100644
--- a/web/skins/classic/views/filter.php
+++ b/web/skins/classic/views/filter.php
@@ -29,7 +29,7 @@ $filterNames = array( ''=>translate('ChooseFilter') );
 $filter = NULL;
 
 foreach ( dbFetchAll( 'SELECT * FROM Filters ORDER BY Name' ) as $row ) {
-  $filterNames[$row['Id']] = $row['Name'];
+  $filterNames[$row['Id']] = $row['Id'] . ' ' . $row['Name'];
   if ( $row['Background'] )
     $filterNames[$row['Id']] .= '*';
   if ( $row['Concurrent'] )