From f0a98200965d64e8802bcade608fd07c41be1249 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 20 Sep 2016 17:53:35 -0400 Subject: [PATCH 1/2] need to convert NULL values before saying not null --- db/zm_update-1.30.7.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/db/zm_update-1.30.7.sql b/db/zm_update-1.30.7.sql index 06d829c88..72641825b 100644 --- a/db/zm_update-1.30.7.sql +++ b/db/zm_update-1.30.7.sql @@ -4,5 +4,7 @@ -- Changing StorageId to be NOT NULL and default 0 -- +UPDATE Monitors SET StorageId = 0 WHERE StorageId IS NULL; ALTER TABLE Monitors MODIFY `StorageId` smallint(5) unsigned NOT NULL default 0; +UPDATE Events SET StorageId = 0 WHERE StorageId IS NULL; ALTER TABLE Events MODIFY `StorageId` smallint(5) unsigned NOT NULL default 0; From 01d4ca96c7db0abd1658aa85ba8070f05547643f Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Wed, 21 Sep 2016 10:15:23 -0400 Subject: [PATCH 2/2] av_unref_packet should be av_packet_unref --- src/zm_ffmpeg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/zm_ffmpeg.h b/src/zm_ffmpeg.h index ecfd6ba2c..1367ce2e5 100644 --- a/src/zm_ffmpeg.h +++ b/src/zm_ffmpeg.h @@ -324,7 +324,7 @@ static av_always_inline av_const int64_t av_clip64_c(int64_t a, int64_t amin, in void zm_dump_stream_format(AVFormatContext *ic, int i, int index, int is_output); #if LIBAVCODEC_VERSION_CHECK(57, 8, 0, 12, 100) - #define zm_av_unref_packet( packet ) av_unref_packet( packet ) + #define zm_av_unref_packet( packet ) av_packet_unref( packet ) #else #define zm_av_unref_packet( packet ) av_free_packet( packet ) #endif