[FFmpeg-cvslog] r22979 - trunk/libavdevice/v4l2.c

lucabe subversion
Tue Apr 27 23:32:11 CEST 2010


Author: lucabe
Date: Tue Apr 27 23:32:11 2010
New Revision: 22979

Log:
Simplify some output messages in the v4l2 input device

Modified:
   trunk/libavdevice/v4l2.c

Modified: trunk/libavdevice/v4l2.c
==============================================================================
--- trunk/libavdevice/v4l2.c	Tue Apr 27 16:04:11 2010	(r22978)
+++ trunk/libavdevice/v4l2.c	Tue Apr 27 23:32:11 2010	(r22979)
@@ -605,8 +605,7 @@ static int v4l2_read_header(AVFormatCont
     if (!s->width && !s->height) {
         struct v4l2_format fmt;
 
-        av_log(s1, AV_LOG_INFO, "Size value (%dx%d) unspecified, querying the device for the current settings\n",
-               s->width, s->height);
+        av_log(s1, AV_LOG_INFO, "Querying the device for the current frame size\n");
         fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
         if (ioctl(s->fd, VIDIOC_G_FMT, &fmt) < 0) {
             av_log(s1, AV_LOG_ERROR, "ioctl(VIDIOC_G_FMT): %s\n", strerror(errno));
@@ -614,7 +613,7 @@ static int v4l2_read_header(AVFormatCont
         }
         s->width  = fmt.fmt.pix.width;
         s->height = fmt.fmt.pix.height;
-        av_log(s1, AV_LOG_INFO, "Setting size to value %dx%d\n", s->width, s->height);
+        av_log(s1, AV_LOG_INFO, "Setting frame size to %dx%d\n", s->width, s->height);
     }
 
     desired_format = device_try_init(s1, ap, &s->width, &s->height, &codec_id);



More information about the ffmpeg-cvslog mailing list