Mercurial > libavformat.hg

changeset 29:86a085c19c7f libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
video_device fixes
author bellard
date Thu, 23 Jan 2003 09:55:19 +0000
parents 64678c053566
children 90fd30dd68b3
files allformats.c avformat.h utils.c
diffstat 3 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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.
  */
--- 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
--- 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;