Imported Upstream version 0.18upstream/0.18

1 files changed, 20 insertions, 14 deletions

diff --git a/src/v4l.c b/src/v4l.c
index f337e02..7732346 100644
--- a/src/v4l.c
+++ b/src/v4l.c
@@ -151,23 +151,29 @@ void camera_cap(cam * cam)
       printf("min height = %d\n", cam->vid_cap.minheight);
    }
 }
-void set_pic_info(cam * cam)
-{
-   char *msg;
-   if(ioctl(cam->dev, VIDIOCSPICT, &cam->vid_pic) == -1) {
-      if(cam->debug == TRUE) {
-         fprintf(stderr, "VIDIOCSPICT  --  could not set picture info, exiting....\n");
-      }
-      msg = g_strdup_printf(_("Could not connect to video device (%s).\nPlease check connection."), cam->video_dev);
-      error_dialog(msg);
-      g_free(msg);
-      exit(0);
-   }
 
+void
+set_pic_info(cam* cam) {
+	char *msg;
+	if(cam->debug) {
+		g_message("SET PIC");
+	}
+	//cam->vid_pic.palette = VIDEO_PALETTE_RGB24;
+	//cam->vid_pic.depth = 24;
+	//cam->vid_pic.palette = VIDEO_PALETTE_YUV420P;
+	if(ioctl(cam->dev, VIDIOCSPICT, &cam->vid_pic) == -1) {
+		if(cam->debug) {
+			g_message("VIDIOCSPICT  --  could not set picture info, exiting....");
+		}
+		msg = g_strdup_printf(_("Could not connect to video device (%s).\nPlease check connection."), cam->video_dev);
+		error_dialog(msg);
+		g_free(msg);
+		exit(0);
+	}
 }
 
-void get_pic_info(cam * cam)
-{
+void get_pic_info(cam * cam){
+//set_pic_info(cam);
    char *msg;
 	
    if(ioctl(cam->dev, VIDIOCGPICT, &cam->vid_pic) == -1) {