# HG changeset patch
# User bellard
# Date 1043315719 0
# Node ID 86a085c19c7f94e485d7a707b959f8aa07e54d73
# Parent  64678c053566accb107c37c4ad602c8b54b20928
video_device fixes

diff -r 64678c053566 -r 86a085c19c7f allformats.c
--- a/allformats.c	Thu Jan 23 09:52:30 2003 +0000
+++ b/allformats.c	Thu Jan 23 09:55:19 2003 +0000
@@ -21,8 +21,6 @@
 /* If you do not call this function, then you can select exactly which
    formats you want to support */
 
-char *video_device = "none";
-
 /**
  * Initialize libavcodec and register all the codecs and formats.
  */
diff -r 64678c053566 -r 86a085c19c7f avformat.h
--- a/avformat.h	Thu Jan 23 09:52:30 2003 +0000
+++ b/avformat.h	Thu Jan 23 09:55:19 2003 +0000
@@ -379,7 +379,11 @@
 int video_grab_init(void);
 int audio_init(void);
 
-extern const char *v4l_device;
+/* DV1394 */
+int dv1394_init(void);
+extern int dv1394_channel;
+
+extern const char *video_device;
 extern const char *audio_device;
 
 #ifdef HAVE_AV_CONFIG_H
diff -r 64678c053566 -r 86a085c19c7f utils.c
--- a/utils.c	Thu Jan 23 09:52:30 2003 +0000
+++ b/utils.c	Thu Jan 23 09:55:19 2003 +0000
@@ -41,6 +41,8 @@
 AVOutputFormat *first_oformat;
 AVImageFormat *first_image_format;
 
+const char *video_device = "none";
+
 void av_register_input_format(AVInputFormat *format)
 {
     AVInputFormat **p;