ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

MOptArgV points into opVect so it needs to stick around.

pull/3530/head
Isaac Connor 2022-07-14 10:14:29 -04:00
parent e6de9c3e01
commit f96e5e526d
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/zm_libvlc_camera.cpp
View File

@ -21,7 +21,6 @@
#include "zm_packet.h" #include "zm_packet.h"
#include "zm_signal.h" #include "zm_signal.h"
#include "zm_utils.h"
#include <dlfcn.h> #include <dlfcn.h>
#if HAVE_LIBVLC #if HAVE_LIBVLC
@ -213,7 +212,7 @@ void LibvlcCamera::Terminate() {
int LibvlcCamera::PrimeCapture() { int LibvlcCamera::PrimeCapture() {
Debug(1, "Priming capture from %s, libvlc version %s", mPath.c_str(), (*libvlc_get_version_f)()); Debug(1, "Priming capture from %s, libvlc version %s", mPath.c_str(), (*libvlc_get_version_f)());
StringVector opVect = Split(Options(), ","); opVect = Split(Options(), ",");
// Set transport method as specified by method field, rtpUni is default // Set transport method as specified by method field, rtpUni is default
if ( Method() == "rtpMulti" ) if ( Method() == "rtpMulti" )

2
src/zm_libvlc_camera.h
View File

@ -21,6 +21,7 @@
#define ZM_LIBVLC_CAMERA_H #define ZM_LIBVLC_CAMERA_H
#include "zm_camera.h" #include "zm_camera.h"
#include "zm_utils.h"
#include <condition_variable> #include <condition_variable>
#include <mutex> #include <mutex>
@ -50,6 +51,7 @@ protected:
std::string mPath; std::string mPath;
std::string mMethod; std::string mMethod;
std::string mOptions; std::string mOptions;
StringVector opVect; // mOptArgV will point into opVect so it needs to hang around
char **mOptArgV; char **mOptArgV;
LibvlcPrivateData mLibvlcData; LibvlcPrivateData mLibvlcData;
std::string mTargetChroma; std::string mTargetChroma;