Reindent code after last commit
Originally committed as revision 8973 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
82dc348bd1
commit
e4dd03f395
@ -430,48 +430,48 @@ static int v4l2_set_parameters( AVFormatContext *s1, AVFormatParameters *ap )
|
|||||||
int i;
|
int i;
|
||||||
|
|
||||||
if(ap->channel>=0) {
|
if(ap->channel>=0) {
|
||||||
/* set tv video input */
|
/* set tv video input */
|
||||||
memset (&input, 0, sizeof (input));
|
memset (&input, 0, sizeof (input));
|
||||||
input.index = ap->channel;
|
input.index = ap->channel;
|
||||||
if(ioctl (s->fd, VIDIOC_ENUMINPUT, &input) < 0) {
|
if(ioctl (s->fd, VIDIOC_ENUMINPUT, &input) < 0) {
|
||||||
av_log(s1, AV_LOG_ERROR, "The V4L2 driver ioctl enum input failed:\n");
|
av_log(s1, AV_LOG_ERROR, "The V4L2 driver ioctl enum input failed:\n");
|
||||||
return AVERROR_IO;
|
return AVERROR_IO;
|
||||||
}
|
}
|
||||||
|
|
||||||
av_log(s1, AV_LOG_DEBUG, "The V4L2 driver set input_id: %d, input: %s\n",
|
av_log(s1, AV_LOG_DEBUG, "The V4L2 driver set input_id: %d, input: %s\n",
|
||||||
ap->channel, input.name);
|
ap->channel, input.name);
|
||||||
if(ioctl (s->fd, VIDIOC_S_INPUT, &input.index) < 0 ) {
|
if(ioctl (s->fd, VIDIOC_S_INPUT, &input.index) < 0 ) {
|
||||||
av_log(s1, AV_LOG_ERROR, "The V4L2 driver ioctl set input(%d) failed\n",
|
av_log(s1, AV_LOG_ERROR, "The V4L2 driver ioctl set input(%d) failed\n",
|
||||||
ap->channel);
|
ap->channel);
|
||||||
return AVERROR_IO;
|
return AVERROR_IO;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(ap->standard) {
|
if(ap->standard) {
|
||||||
av_log(s1, AV_LOG_DEBUG, "The V4L2 driver set standard: %s\n",
|
av_log(s1, AV_LOG_DEBUG, "The V4L2 driver set standard: %s\n",
|
||||||
ap->standard );
|
ap->standard );
|
||||||
/* set tv standard */
|
/* set tv standard */
|
||||||
memset (&standard, 0, sizeof (standard));
|
memset (&standard, 0, sizeof (standard));
|
||||||
for(i=0;;i++) {
|
for(i=0;;i++) {
|
||||||
standard.index = i;
|
standard.index = i;
|
||||||
if (ioctl(s->fd, VIDIOC_ENUMSTD, &standard) < 0) {
|
if (ioctl(s->fd, VIDIOC_ENUMSTD, &standard) < 0) {
|
||||||
|
av_log(s1, AV_LOG_ERROR, "The V4L2 driver ioctl set standard(%s) failed\n",
|
||||||
|
ap->standard);
|
||||||
|
return AVERROR_IO;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(!strcasecmp(standard.name, ap->standard)) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
av_log(s1, AV_LOG_DEBUG, "The V4L2 driver set standard: %s, id: %"PRIu64"\n",
|
||||||
|
ap->standard, standard.id);
|
||||||
|
if (ioctl(s->fd, VIDIOC_S_STD, &standard.id) < 0) {
|
||||||
av_log(s1, AV_LOG_ERROR, "The V4L2 driver ioctl set standard(%s) failed\n",
|
av_log(s1, AV_LOG_ERROR, "The V4L2 driver ioctl set standard(%s) failed\n",
|
||||||
ap->standard);
|
ap->standard);
|
||||||
return AVERROR_IO;
|
return AVERROR_IO;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!strcasecmp(standard.name, ap->standard)) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
av_log(s1, AV_LOG_DEBUG, "The V4L2 driver set standard: %s, id: %"PRIu64"\n",
|
|
||||||
ap->standard, standard.id);
|
|
||||||
if (ioctl(s->fd, VIDIOC_S_STD, &standard.id) < 0) {
|
|
||||||
av_log(s1, AV_LOG_ERROR, "The V4L2 driver ioctl set standard(%s) failed\n",
|
|
||||||
ap->standard);
|
|
||||||
return AVERROR_IO;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user