diff options
| author | Ramiro Polla <ramiro@lisha.ufsc.br> | 2007-02-14 17:01:32 +0000 |
|---|---|---|
| committer | Guillaume Poirier <gpoirier@mplayerhq.hu> | 2007-02-14 17:01:32 +0000 |
| commit | cc58300e30e7aea6acfecd72a04a3886b285cfd8 (patch) | |
| tree | e1060df29a65226dcdf1378538c920a1a544e2f8 /libavformat/dv1394.c | |
| parent | 20121213630a03001148f3ffdadac895dae8d7c5 (diff) | |
| download | ffmpeg-cc58300e30e7aea6acfecd72a04a3886b285cfd8.tar.gz | |
implement new grabbing interface, as described here:
ttp://thread.gmane.org/gmane.comp.video.ffmpeg.devel/42920
patch by Ramiro Polla % ramiro A lisha P ufsc P br %
Original thread:
Date: Jan 31, 2007 8:56 PM
Subject: [Ffmpeg-devel] [PATCH] New grabbing interface
Originally committed as revision 7983 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/dv1394.c')
| -rw-r--r-- | libavformat/dv1394.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libavformat/dv1394.c b/libavformat/dv1394.c index c5795ca022..3a5f479c8e 100644 --- a/libavformat/dv1394.c +++ b/libavformat/dv1394.c @@ -83,7 +83,6 @@ static int dv1394_start(struct dv1394_data *dv) static int dv1394_read_header(AVFormatContext * context, AVFormatParameters * ap) { struct dv1394_data *dv = context->priv_data; - const char *video_device; dv->dv_demux = dv_init_demux(context); if (!dv->dv_demux) @@ -100,10 +99,7 @@ static int dv1394_read_header(AVFormatContext * context, AVFormatParameters * ap dv->channel = DV1394_DEFAULT_CHANNEL; /* Open and initialize DV1394 device */ - video_device = ap->device; - if (!video_device) - video_device = "/dev/dv1394/0"; - dv->fd = open(video_device, O_RDONLY); + dv->fd = open(context->filename, O_RDONLY); if (dv->fd < 0) { perror("Failed to open DV interface"); goto failed; |