Commit 2f210dda authored by Björn Isacsson's avatar Björn Isacsson
Browse files

Fixed camera.c errors and warnings

parent 8efd5622
......@@ -4,7 +4,7 @@ camera* camera_open(){
camera *cam = malloc(sizeof(camera));
if (!cam){
perror("Out of memory, cannot malloc camera");
return;
return NULL;
}
#ifdef FAKE
cam->frame_nbr = 0;
......@@ -37,11 +37,11 @@ static int analyse_frames(media_frame *cur_frame, media_frame *prev_frame){
char *prev_data = NULL;
int prev_width;
int prev_height;
int prev_stride;
//int prev_stride;
char *cur_data = NULL;
int cur_width;
int cur_height;
int cur_stride;
//int cur_stride;
int result = 0;
prev_data = (char *)capture_frame_data(prev_frame);
......@@ -76,7 +76,7 @@ size_t get_frame_size(frame* f){
}
capture_time get_frame_timestamp(frame* f){
return f->fr->time;
return capture_frame_timestamp(f->fr);
}
int get_frame_motion(frame* f){
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment