scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-04-07 17:05:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

V4L2 minor fixes

Browse Source
This commit is contained in:
Martin Pulec
2014-03-05 16:54:51 +01:00
parent 0e749b5dd9
commit 61a776fe0a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/video_capture/v4l2.c
View File

@@ -248,7 +248,7 @@ struct vidcap_type * vidcap_v4l2_probe(void)
void * vidcap_v4l2_init(const struct vidcap_params *params)
{
struct vidcap_v4l2_state *s;
char *dev_name = DEFAULT_DEVICE;
const char *dev_name = DEFAULT_DEVICE;
uint32_t pixelformat = 0;
uint32_t width = 0,
height = 0;
@@ -263,7 +263,7 @@ void * vidcap_v4l2_init(const struct vidcap_params *params)
}
s = (struct vidcap_v4l2_state *) malloc(sizeof(struct vidcap_v4l2_state));
s = (struct vidcap_v4l2_state *) calloc(1, sizeof(struct vidcap_v4l2_state));
if(s == NULL) {
printf("Unable to allocate v4l2 capture state\n");
return NULL;
@@ -589,6 +589,7 @@ struct video_frame * vidcap_v4l2_grab(void *state, struct audio_frame **audio)
};
struct v4l2_buffer buf;
memset(&buf, 0, sizeof(buf));
buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
buf.memory = V4L2_MEMORY_MMAP;