aboutsummaryrefslogtreecommitdiff
path: root/libavformat/grab.c
diff options
context:
space:
mode:
authorMax Krasnyansky2003-01-22 22:40:52 +0000
committerFabrice Bellard2003-01-22 22:40:52 +0000
commit8aa3ee32c257541a91bab1e47364f4f655e9e69d (patch)
tree2f3593864ea116c97fd180f40e5ac3244d8e3b13 /libavformat/grab.c
parent4b8b2edb6260d0f0b9e5f2f10a28c3ab19143f2f (diff)
dv patch by Max Krasnyansky (maxk at qualcomm dot com)
Originally committed as revision 1493 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/grab.c')
-rw-r--r--libavformat/grab.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/libavformat/grab.c b/libavformat/grab.c
index 8173bac369..263c2946b9 100644
--- a/libavformat/grab.c
+++ b/libavformat/grab.c
@@ -53,8 +53,6 @@ static int aiw_init(VideoData *s);
static int aiw_read_picture(VideoData *s, uint8_t *data);
static int aiw_close(VideoData *s);
-const char *v4l_device = "/dev/video";
-
static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
{
VideoData *s = s1->priv_data;
@@ -80,9 +78,9 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
s->height = height;
s->frame_rate = frame_rate;
- video_fd = open(v4l_device, O_RDWR);
+ video_fd = open(video_device, O_RDWR);
if (video_fd < 0) {
- perror(v4l_device);
+ perror(video_device);
goto fail;
}
@@ -339,7 +337,7 @@ static int grab_read_close(AVFormatContext *s1)
}
static AVInputFormat video_grab_device_format = {
- "video_grab_device",
+ "video4linux",
"video grab",
sizeof(VideoData),
NULL,