On 2011-12-27 14:20:52 +0100, Luca Barbato wrote:
> ---
>  libavdevice/v4l2.c |   10 +++++-----
>  1 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
> index 2fc81c5..60e7dbf 100644
> --- a/libavdevice/v4l2.c
> +++ b/libavdevice/v4l2.c
> @@ -716,11 +716,11 @@ static int v4l2_read_close(AVFormatContext *s1)
>  #define OFFSET(x) offsetof(struct video_data, x)
>  #define DEC AV_OPT_FLAG_DECODING_PARAM
>  static const AVOption options[] = {
> -    { "standard", "", offsetof(struct video_data, standard), 
> AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, AV_OPT_FLAG_DECODING_PARAM },
> -    { "channel",  "", offsetof(struct video_data, channel),  
> AV_OPT_TYPE_INT,    {.dbl = 0 }, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
> -    { "video_size", "A string describing frame size, such as 640x480 or 
> hd720.", OFFSET(video_size), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC },
> -    { "pixel_format", "", OFFSET(pixel_format), AV_OPT_TYPE_STRING, {.str = 
> NULL}, 0, 0, DEC },
> -    { "framerate", "", OFFSET(framerate), AV_OPT_TYPE_STRING, {.str = NULL}, 
> 0, 0, DEC },
> +    { "standard",     "TV standard, used only by analog frame grabber",      
>       OFFSET(standard),     AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0,       
> DEC },
> +    { "channel",      "TV channel, used only by frame grabber",              
>       OFFSET(channel),      AV_OPT_TYPE_INT,    {.dbl = 0 },    0, INT_MAX, 
> DEC },
> +    { "video_size",   "A string describing frame size, such as 640x480 or 
> hd720.", OFFSET(video_size),   AV_OPT_TYPE_STRING, {.str = NULL},  0, 0,      
>  DEC },
> +    { "pixel_format", "",                                                    
>       OFFSET(pixel_format), AV_OPT_TYPE_STRING, {.str = NULL},  0, 0,       
> DEC },
> +    { "framerate",    "",                                                    
>       OFFSET(framerate),    AV_OPT_TYPE_STRING, {.str = NULL},  0, 0,       
> DEC },
>      { NULL },
>  };
>  

ok

Janne
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to