From 4f54d924bcd7b50e9bab3156874f20a2754eb138 Mon Sep 17 00:00:00 2001
From: Luca Abeni <lucabe72@email.it>
Date: Tue, 27 Apr 2010 21:32:11 +0000
Subject: [PATCH] Simplify some output messages in the v4l2 input device
Originally committed as revision 22979 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavdevice/v4l2.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
index 88d2fbc55e7..f9fa40e90f8 100644
--- a/libavdevice/v4l2.c
+++ b/libavdevice/v4l2.c
@@ -605,8 +605,7 @@ static int v4l2_read_header(AVFormatContext *s1, AVFormatParameters *ap)
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(AVFormatContext *s1, AVFormatParameters *ap)
}
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);
--
GitLab