diff options
| author | Fabrice Bellard <fabrice@bellard.org> | 2003-01-23 09:55:19 +0000 |
|---|---|---|
| committer | Fabrice Bellard <fabrice@bellard.org> | 2003-01-23 09:55:19 +0000 |
| commit | 86fd51fbad0626a9307b0da4e6969e0482862089 (patch) | |
| tree | acdbebe66e6667aa1812a76528ba1c330dfccd10 | |
| parent | 2a6874fd24388de531e3d1441fa8cd36517f5721 (diff) | |
| download | ffmpeg-86fd51fbad0626a9307b0da4e6969e0482862089.tar.gz | |
video_device fixes
Originally committed as revision 1497 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/allformats.c | 2 | ||||
| -rw-r--r-- | libavformat/avformat.h | 6 | ||||
| -rw-r--r-- | libavformat/utils.c | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 8e8c9f059f..47bcb4f9c6 100644 --- a/libavformat/allformats.c +++ b/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. */ diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 4646af763d..e67001c81b 100644 --- a/libavformat/avformat.h +++ b/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 diff --git a/libavformat/utils.c b/libavformat/utils.c index f811b2c628..4ebca7daec 100644 --- a/libavformat/utils.c +++ b/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; |