lavd/avdevice: use better option types for caps options
authorLukasz Marek <lukasz.m.luki2@gmail.com>
Sat, 13 Dec 2014 19:25:42 +0000 (20:25 +0100)
committerLukasz Marek <lukasz.m.luki2@gmail.com>
Sun, 14 Dec 2014 22:55:41 +0000 (23:55 +0100)
Using dedicated types allows to use format/layout names,
not just raw int values.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
libavdevice/avdevice.c

index 755f251..fda3cd0 100644 (file)
 const AVOption av_device_capabilities[] = {
     { "codec", "codec", OFFSET(codec), AV_OPT_TYPE_INT,
         {.i64 = AV_CODEC_ID_NONE}, AV_CODEC_ID_NONE, INT_MAX, E|D|A|V },
-    { "sample_format", "sample format", OFFSET(sample_format), AV_OPT_TYPE_INT,
-        {.i64 = AV_SAMPLE_FMT_NONE}, -1, INT_MAX, E|D|A },
+    { "sample_format", "sample format", OFFSET(sample_format), AV_OPT_TYPE_SAMPLE_FMT,
+        {.i64 = AV_SAMPLE_FMT_NONE}, AV_SAMPLE_FMT_NONE, INT_MAX, E|D|A },
     { "sample_rate", "sample rate", OFFSET(sample_rate), AV_OPT_TYPE_INT,
         {.i64 = -1}, -1, INT_MAX, E|D|A },
     { "channels", "channels", OFFSET(channels), AV_OPT_TYPE_INT,
         {.i64 = -1}, -1, INT_MAX, E|D|A },
-    { "channel_layout", "channel layout", OFFSET(channel_layout), AV_OPT_TYPE_INT64,
+    { "channel_layout", "channel layout", OFFSET(channel_layout), AV_OPT_TYPE_CHANNEL_LAYOUT,
         {.i64 = -1}, -1, INT_MAX, E|D|A },
-    { "pixel_format", "pixel format", OFFSET(pixel_format), AV_OPT_TYPE_INT,
-        {.i64 = AV_PIX_FMT_NONE}, -1, INT_MAX, E|D|V },
+    { "pixel_format", "pixel format", OFFSET(pixel_format), AV_OPT_TYPE_PIXEL_FMT,
+        {.i64 = AV_PIX_FMT_NONE}, AV_PIX_FMT_NONE, INT_MAX, E|D|V },
     { "window_size", "window size", OFFSET(window_width), AV_OPT_TYPE_IMAGE_SIZE,
         {.str = NULL}, -1, INT_MAX, E|D|V },
     { "frame_size", "frame size", OFFSET(frame_width), AV_OPT_TYPE_IMAGE_SIZE,