Merge branch 'feature-h264-videostorage' into storageareas

2026-07-08 04:05:32 -04:00 · 2016-09-13 09:53:39 -04:00
parent 5fb1c45c4e 39e06b929f
commit 2bc5742aec
7 changed files with 51 additions and 18 deletions
--- a/src/zm_ffmpeg_camera.cpp
+++ b/src/zm_ffmpeg_camera.cpp
@@ -600,6 +600,7 @@ int FfmpegCamera::CaptureAndRecord( Image &image, bool recording, char* event_fi
                                          NULL,
                                          startTime,
                                          this->getMonitor()->getOrientation());
+
            } else {
              Debug(3, "Video module initiated with audio stream");
              videoStore = new VideoStore((const char *) event_file, "mp4",