Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
external
ffmpeg
Commits
986f4f49
Commit
986f4f49
authored
May 23, 2011
by
Anton Khirnov
Browse files
dv1394: add a private option for channel.
parent
3d2a4186
Changes
1
Hide whitespace changes
Inline
Side-by-side
libavdevice/dv1394.c
View file @
986f4f49
...
...
@@ -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
},
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment