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/grab_bktr.c | |
| parent | 20121213630a03001148f3ffdadac895dae8d7c5 (diff) | |
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/grab_bktr.c')
| -rw-r--r-- | libavformat/grab_bktr.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libavformat/grab_bktr.c b/libavformat/grab_bktr.c index 86348af5b1..100653db79 100644 --- a/libavformat/grab_bktr.c +++ b/libavformat/grab_bktr.c @@ -243,7 +243,6 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap) int frame_rate; int frame_rate_base; int format = -1; - const char *video_device; if (ap->width <= 0 || ap->height <= 0 || ap->time_base.den <= 0) return -1; @@ -253,10 +252,6 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap) frame_rate = ap->time_base.den; frame_rate_base = ap->time_base.num; - video_device = ap->device; - if (!video_device) - video_device = "/dev/bktr0"; - st = av_new_stream(s1, 0); if (!st) return AVERROR(ENOMEM); @@ -285,7 +280,7 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap) format = NTSC; } - if (bktr_init(video_device, width, height, format, + if (bktr_init(s1->filename, width, height, format, &(s->video_fd), &(s->tuner_fd), -1, 0.0) < 0) return AVERROR(EIO); |