video_device fixes

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@1497 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

libavformat/allformats.c

@@ -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.
  */

libavformat/avformat.h

@@ -379,7 +379,11 @@ int filename_number_test(const char *filename);
 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

libavformat/utils.c

@@ -41,6 +41,8 @@ AVInputFormat *first_iformat;
 AVOutputFormat *first_oformat;
 AVImageFormat *first_image_format;
 
+const char *video_device = "none";
+
 void av_register_input_format(AVInputFormat *format)
 {
     AVInputFormat **p;