[FFmpeg-cvslog] dv1394: add a private option for channel.

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Mon May 23 21:55:44 2011 +0200| [986f4f491840d7c440ef4ccde7adcef219be26f3] | committer: Anton Khirnov

dv1394: add a private option for channel.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=986f4f491840d7c440ef4ccde7adcef219be26f3
---

 libavdevice/dv1394.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/libavdevice/dv1394.c b/libavdevice/dv1394.c
index 2515f78..0981eff 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 },
 };