From 7f172339fdcdeb0393c1a296da95acb6fc57d3b8 Mon Sep 17 00:00:00 2001
From: Fabrice Bellard <fabrice@bellard.org>
Date: Thu, 23 Jan 2003 10:33:16 +0000
Subject: grab device is in AVFormatParameter (at least better than global
 variable)

Originally committed as revision 1499 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavformat/avformat.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'libavformat/avformat.h')

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index e67001c81b..9b00eba471 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -61,6 +61,8 @@ typedef struct AVFormatParameters {
     int height;
     enum PixelFormat pix_fmt;
     struct AVImageFormat *image_format;
+    int channel; /* used to select dv channel */
+    const char *device; /* video4linux, audio or DV device */
 } AVFormatParameters;
 
 #define AVFMT_NOFILE        0x0001 /* no file should be opened */
@@ -381,10 +383,6 @@ int audio_init(void);
 
 /* DV1394 */
 int dv1394_init(void);
-extern int dv1394_channel;
-
-extern const char *video_device;
-extern const char *audio_device;
 
 #ifdef HAVE_AV_CONFIG_H
 int strstart(const char *str, const char *val, const char **ptr);
-- 
cgit v1.2.3