ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move VIDEO_MAX_FRAME up

This commit is contained in:
Andrew Bauer 2016-06-06 19:04:02 -05:00
parent 06923d44ba
commit f289b84901
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/zm_local_camera.h
View File

@ -36,6 +36,11 @@
#include <linux/videodev2.h> #include <linux/videodev2.h>
#endif // HAVE_LINUX_VIDEODEV2_H #endif // HAVE_LINUX_VIDEODEV2_H
// Required on systems with v4l1 but without v4l2 headers
#ifndef VIDEO_MAX_FRAME
#define VIDEO_MAX_FRAME 32
#endif
#include "zm_ffmpeg.h" #include "zm_ffmpeg.h"
// //
@ -105,11 +110,6 @@ protected:
static V4L1Data v4l1_data; static V4L1Data v4l1_data;
#endif // ZM_HAS_V4L1 #endif // ZM_HAS_V4L1
// Required on systems with v4l1 but without v4l2 headers
#ifndef VIDEO_MAX_FRAME
#define VIDEO_MAX_FRAME 32
#endif
#if HAVE_LIBSWSCALE #if HAVE_LIBSWSCALE
static AVFrame **capturePictures; static AVFrame **capturePictures;
_AVPIXELFORMAT imagePixFormat; _AVPIXELFORMAT imagePixFormat;