diff options
| author | Fabrice Bellard <fabrice@bellard.org> | 2003-01-23 10:33:16 +0000 |
|---|---|---|
| committer | Fabrice Bellard <fabrice@bellard.org> | 2003-01-23 10:33:16 +0000 |
| commit | 7f172339fdcdeb0393c1a296da95acb6fc57d3b8 (patch) | |
| tree | ed930c7e3f091d4bd816974e8da19c548eab08f9 /libavformat/avformat.h | |
| parent | 79a7c2683e12398725dbf2fa8984ea371a6965ce (diff) | |
| download | ffmpeg-7f172339fdcdeb0393c1a296da95acb6fc57d3b8.tar.gz | |
grab device is in AVFormatParameter (at least better than global variable)
Originally committed as revision 1499 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/avformat.h')
| -rw-r--r-- | libavformat/avformat.h | 6 |
1 files changed, 2 insertions, 4 deletions
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); |