aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorLuca Abeni <lucabe72@email.it>2006-02-01 11:31:33 +0000
committerDiego Biurrun <diego@biurrun.de>2006-02-01 11:31:33 +0000
commit0a7b514f13baddda8641ab365aa2f9c218839c47 (patch)
treefbfc6d5fd2691800880de6b3884d617e4679490c /ffmpeg.c
parentb5bba45905c074d9c8a9388589fda3f48cb08437 (diff)
downloadffmpeg-0a7b514f13baddda8641ab365aa2f9c218839c47.tar.gz
video4linux2 input support
patch by Luca Abeni, lucabe72 $$at$$ email $$dot$$ it Originally committed as revision 4916 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index f3f2817030..6d22e43b16 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -213,8 +213,12 @@ static int rate_emu = 0;
#ifdef CONFIG_BKTR
static char *video_grab_format = "bktr";
#else
+#ifdef CONFIG_VIDEO4LINUX2
+static char *video_grab_format = "video4linux2";
+#else
static char *video_grab_format = "video4linux";
#endif
+#endif
static char *video_device = NULL;
static char *grab_device = NULL;
static int video_channel = 0;