---
libavdevice/dshow.c | 32 ++++++++------------------------
1 file changed, 8 insertions(+), 24 deletions(-)
diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c
index 0c2eca0..31764a9 100644
--- a/libavdevice/dshow.c
+++ b/libavdevice/dshow.c
@@ -1268,36 +1268,20 @@ static const AVOption options[] = {
{ "sample_size", "set audio sample size", OFFSET(sample_size),
AV_OPT_TYPE_INT, {.i64 = 0}, 0, 16, DEC },
{ "channels", "set number of audio channels, such as 1 or 2",
OFFSET(channels), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, DEC },
{ "audio_buffer_size", "set audio device buffer latency size in
milliseconds (default is the device's default)", OFFSET(audio_buffer_size),
AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, DEC },
- { "list_devices", "list available devices", OFFSET(list_devices),
AV_OPT_TYPE_INT, {.i64=0}, 0, 1, DEC, "list_devices" },
- { "true", "", 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, DEC, "list_devices" },
- { "false", "", 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, DEC, "list_devices" },
- { "list_options", "list available options for specified device",
OFFSET(list_options), AV_OPT_TYPE_INT, {.i64=0}, 0, 1, DEC, "list_options" },
- { "true", "", 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, DEC, "list_options" },
- { "false", "", 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, DEC, "list_options" },
+ { "list_devices", "list available devices",
OFFSET(list_devices), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, DEC },
+ { "list_options", "list available options for specified device",
OFFSET(list_options), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, DEC },
{ "video_device_number", "set video device number for devices with same
name (starts at 0)", OFFSET(video_device_number), AV_OPT_TYPE_INT, {.i64 = 0},
0, INT_MAX, DEC },
{ "audio_device_number", "set audio device number for devices with same
name (starts at 0)", OFFSET(audio_device_number), AV_OPT_TYPE_INT, {.i64 = 0},
0, INT_MAX, DEC },
{ "video_pin_name", "select video capture pin by name",
OFFSET(video_pin_name),AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0,
AV_OPT_FLAG_ENCODING_PARAM },
{ "audio_pin_name", "select audio capture pin by name",
OFFSET(audio_pin_name),AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0,
AV_OPT_FLAG_ENCODING_PARAM },
{ "crossbar_video_input_pin_number", "set video input pin number for
crossbar device", OFFSET(crossbar_video_input_pin_number), AV_OPT_TYPE_INT,
{.i64 = -1}, -1, INT_MAX, DEC },
{ "crossbar_audio_input_pin_number", "set audio input pin number for
crossbar device", OFFSET(crossbar_audio_input_pin_number), AV_OPT_TYPE_INT,
{.i64 = -1}, -1, INT_MAX, DEC },
- { "show_video_device_dialog", "display property dialog for video capture
device", OFFSET(show_video_device_dialog), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1,
DEC, "show_video_device_dialog" },
- { "true", "", 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, DEC,
"show_video_device_dialog" },
- { "false", "", 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, DEC,
"show_video_device_dialog" },
- { "show_audio_device_dialog", "display property dialog for audio capture
device", OFFSET(show_audio_device_dialog), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1,
DEC, "show_audio_device_dialog" },
- { "true", "", 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, DEC,
"show_audio_device_dialog" },
- { "false", "", 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, DEC,
"show_audio_device_dialog" },
- { "show_video_crossbar_connection_dialog", "display property dialog for
crossbar connecting pins filter on video device",
OFFSET(show_video_crossbar_connection_dialog), AV_OPT_TYPE_INT, {.i64 = 0}, 0,
1, DEC, "show_video_crossbar_connection_dialog" },
- { "true", "", 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, DEC,
"show_video_crossbar_connection_dialog" },
- { "false", "", 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, DEC,
"show_video_crossbar_connection_dialog" },
- { "show_audio_crossbar_connection_dialog", "display property dialog for
crossbar connecting pins filter on audio device",
OFFSET(show_audio_crossbar_connection_dialog), AV_OPT_TYPE_INT, {.i64 = 0}, 0,
1, DEC, "show_audio_crossbar_connection_dialog" },
- { "true", "", 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, DEC,
"show_audio_crossbar_connection_dialog" },
- { "false", "", 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, DEC,
"show_audio_crossbar_connection_dialog" },
- { "show_analog_tv_tuner_dialog", "display property dialog for analog tuner
filter", OFFSET(show_analog_tv_tuner_dialog), AV_OPT_TYPE_INT, {.i64 = 0}, 0,
1, DEC, "show_analog_tv_tuner_dialog" },
- { "true", "", 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, DEC,
"show_analog_tv_tuner_dialog" },
- { "false", "", 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, DEC,
"show_analog_tv_tuner_dialog" },
- { "show_analog_tv_tuner_audio_dialog", "display property dialog for analog
tuner audio filter", OFFSET(show_analog_tv_tuner_audio_dialog),
AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, DEC, "show_analog_tv_tuner_dialog" },
- { "true", "", 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, DEC,
"show_analog_tv_tuner_audio_dialog" },
- { "false", "", 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, DEC,
"show_analog_tv_tuner_audio_dialog" },
+ { "show_video_device_dialog", "display property dialog for
video capture device",
OFFSET(show_video_device_dialog), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0,
1, DEC },
+ { "show_audio_device_dialog", "display property dialog for
audio capture device",
OFFSET(show_audio_device_dialog), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0,
1, DEC },
+ { "show_video_crossbar_connection_dialog", "display property dialog for
crossbar connecting pins filter on video device",
OFFSET(show_video_crossbar_connection_dialog), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0,
1, DEC },
+ { "show_audio_crossbar_connection_dialog", "display property dialog for
crossbar connecting pins filter on audio device",
OFFSET(show_audio_crossbar_connection_dialog), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0,
1, DEC },
+ { "show_analog_tv_tuner_dialog", "display property dialog for
analog tuner filter",
OFFSET(show_analog_tv_tuner_dialog), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0,
1, DEC },
+ { "show_analog_tv_tuner_audio_dialog", "display property dialog for
analog tuner audio filter",
OFFSET(show_analog_tv_tuner_audio_dialog), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0,
1, DEC },
{ "audio_device_load", "load audio capture filter device (and properties)
from file", OFFSET(audio_filter_load_file), AV_OPT_TYPE_STRING, {.str = NULL},
0, 0, DEC },
{ "audio_device_save", "save audio capture filter device (and properties)
to file", OFFSET(audio_filter_save_file), AV_OPT_TYPE_STRING, {.str = NULL}, 0,
0, DEC },
{ "video_device_load", "load video capture filter device (and properties)
from file", OFFSET(video_filter_load_file), AV_OPT_TYPE_STRING, {.str = NULL},
0, 0, DEC },
--
2.5.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
