aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/v4l2.c
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2006-07-09 23:40:53 +0000
committerMåns Rullgård <mans@mansr.com>2006-07-09 23:40:53 +0000
commitd2a067d1d9011bf1015fd23efcbfb20cd4f79e1a (patch)
tree859e011692e235fd60c89e25caea93c7e2d87fad /libavformat/v4l2.c
parent21227514de650da3de297acce893175230f04beb (diff)
downloadffmpeg-d2a067d1d9011bf1015fd23efcbfb20cd4f79e1a.tar.gz
give AVInput/OutputFormat structs consistent names
Originally committed as revision 5697 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/v4l2.c')
-rw-r--r--libavformat/v4l2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/v4l2.c b/libavformat/v4l2.c
index 3a2ad1fbac..f9059a18bc 100644
--- a/libavformat/v4l2.c
+++ b/libavformat/v4l2.c
@@ -522,7 +522,7 @@ static int v4l2_read_close(AVFormatContext *s1)
return 0;
}
-static AVInputFormat v4l2_format = {
+static AVInputFormat v4l2_demuxer = {
"video4linux2",
"video grab",
sizeof(struct video_data),
@@ -535,6 +535,6 @@ static AVInputFormat v4l2_format = {
int v4l2_init(void)
{
- av_register_input_format(&v4l2_format);
+ av_register_input_format(&v4l2_demuxer);
return 0;
}