aboutsummaryrefslogtreecommitdiffstats
path: root/libavdevice
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-05-23 21:55:44 +0200
committerAnton Khirnov <anton@khirnov.net>2011-05-25 15:55:47 +0200
commit986f4f491840d7c440ef4ccde7adcef219be26f3 (patch)
tree3406e81f648b7c3587e366b70c0cf3af12829444 /libavdevice
parent3d2a418605b23b475b4217a93e8e60660154e198 (diff)
downloadffmpeg-986f4f491840d7c440ef4ccde7adcef219be26f3.tar.gz
dv1394: add a private option for channel.
Diffstat (limited to 'libavdevice')
-rw-r--r--libavdevice/dv1394.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libavdevice/dv1394.c b/libavdevice/dv1394.c
index 2515f78c8f..0981eff53c 100644
--- a/libavdevice/dv1394.c
+++ b/libavdevice/dv1394.c
@@ -104,8 +104,6 @@ static int dv1394_read_header(AVFormatContext * context, AVFormatParameters * ap
if (ap->channel)
dv->channel = ap->channel;
- else
- dv->channel = DV1394_DEFAULT_CHANNEL;
/* Open and initialize DV1394 device */
dv->fd = open(context->filename, O_RDONLY);
@@ -238,6 +236,7 @@ static const AVOption options[] = {
{ "standard", "", offsetof(struct dv1394_data, format), FF_OPT_TYPE_INT, {.dbl = DV1394_NTSC}, DV1394_PAL, DV1394_NTSC, AV_OPT_FLAG_DECODING_PARAM, "standard" },
{ "PAL", "", 0, FF_OPT_TYPE_CONST, {.dbl = DV1394_PAL}, 0, 0, AV_OPT_FLAG_DECODING_PARAM, "standard" },
{ "NTSC", "", 0, FF_OPT_TYPE_CONST, {.dbl = DV1394_NTSC}, 0, 0, AV_OPT_FLAG_DECODING_PARAM, "standard" },
+ { "channel", "", offsetof(struct dv1394_data, channel), FF_OPT_TYPE_INT, {.dbl = DV1394_DEFAULT_CHANNEL}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
{ NULL },
};