On 24/08/14 14:13, Luca Barbato wrote:
> ---
> 
> git commit --amend leftover...
> 
>  libavdevice/pulse.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libavdevice/pulse.c b/libavdevice/pulse.c
> index d724964..2136ee3 100644
> --- a/libavdevice/pulse.c
> +++ b/libavdevice/pulse.c
> @@ -172,7 +172,7 @@ static const AVOption options[] = {
>      { "channels",      "number of audio channels",                       
> OFFSET(channels),      AV_OPT_TYPE_INT,    {.i64 = 2},        1, INT_MAX, D },
>      { "frame_size",    "number of bytes per frame",                      
> OFFSET(frame_size),    AV_OPT_TYPE_INT,    {.i64 = 1024},     1, INT_MAX, D },
>      { "fragment_size", "buffering size, affects latency and cpu usage",  
> OFFSET(fragment_size), AV_OPT_TYPE_INT,    {.i64 = -1},      -1, INT_MAX, D },
> -    { "wallclock",     "set the initial pts using the current time",     
> OFFSET(wallclock),     AV_OPT_TYPE_INT,    {.i64 = 0},       -1, 1, D },
> +    { "wallclock",     "set the initial pts using the current time",     
> OFFSET(wallclock),     AV_OPT_TYPE_INT,    {.i64 = 1},       -1, 1, D },
>      { NULL },
>  };
> 

Is it ok to merge with the previous and put on the releases as well?

lu

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

Reply via email to