Commit 4f54d924 authored by Luca Abeni's avatar Luca Abeni

Simplify some output messages in the v4l2 input device

Originally committed as revision 22979 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 4f5e6ef1
......@@ -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);
......
Markdown is supported
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