mirror of https://git.ffmpeg.org/ffmpeg.git
Allow avoid setting the video standard and input when capturing v4l2 video.
Patch by Limin Wang, edited by me Originally committed as revision 8971 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
5ecb0677a2
commit
0d6c07329e
|
@ -429,6 +429,7 @@ static int v4l2_set_parameters( AVFormatContext *s1, AVFormatParameters *ap )
|
|||
struct v4l2_standard standard;
|
||||
int i;
|
||||
|
||||
if(ap->channel>=0) {
|
||||
/* set tv video input */
|
||||
memset (&input, 0, sizeof (input));
|
||||
input.index = ap->channel;
|
||||
|
@ -444,7 +445,9 @@ static int v4l2_set_parameters( AVFormatContext *s1, AVFormatParameters *ap )
|
|||
ap->channel);
|
||||
return AVERROR_IO;
|
||||
}
|
||||
}
|
||||
|
||||
if(ap->standard) {
|
||||
av_log(s1, AV_LOG_DEBUG, "The V4L2 driver set standard: %s\n",
|
||||
ap->standard );
|
||||
/* set tv standard */
|
||||
|
@ -469,6 +472,7 @@ static int v4l2_set_parameters( AVFormatContext *s1, AVFormatParameters *ap )
|
|||
ap->standard);
|
||||
return AVERROR_IO;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue