diff mbox

[FFmpeg-devel,1/2] avfilter: pass correct argument to helper function

Message ID 20171027161939.3625-1-onemda@gmail.com
State Accepted
Commit e6055af025c1f96b47ac71107dca6169ed430824
Headers show

Commit Message

Paul B Mahol Oct. 27, 2017, 4:19 p.m. UTC 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
---
 libavfilter/avfilter.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Paul B Mahol Oct. 28, 2017, 8:23 a.m. UTC | #1 
On 10/27/17, Paul B Mahol <onemda@gmail.com> wrote:
> Signed-off-by: Paul B Mahol <onemda@gmail.com>
> ---
>  libavfilter/avfilter.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
> index bc9e60bb85..b98b32bacb 100644
> --- a/libavfilter/avfilter.c
> +++ b/libavfilter/avfilter.c
> @@ -1532,7 +1532,7 @@ int ff_inlink_consume_samples(AVFilterLink *link,
> unsigned min, unsigned max,
>          return 0;
>      if (link->status_in)
>          min = FFMIN(min, ff_framequeue_queued_samples(&link->fifo));
> -    ret = take_samples(link, min, link->max_samples, &frame);
> +    ret = take_samples(link, min, max, &frame);
>      if (ret < 0)
>          return ret;
>      consume_update(link, frame);
> --
> 2.11.0
>
>

Will push patchset soon as it fixes serious bug.
Nicolas George Oct. 28, 2017, 9:34 a.m. UTC | #2 
Le sextidi 6 brumaire, an CCXXVI, Paul B Mahol a écrit :
> Signed-off-by: Paul B Mahol <onemda@gmail.com>
> ---
>  libavfilter/avfilter.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Give me more time to review this change.
Paul B Mahol Oct. 28, 2017, 11:39 a.m. UTC | #3 
On 10/28/17, Nicolas George <george@nsup.org> wrote:
> Le sextidi 6 brumaire, an CCXXVI, Paul B Mahol a ecrit :
>> Signed-off-by: Paul B Mahol <onemda@gmail.com>
>> ---
>>  libavfilter/avfilter.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> Give me more time to review this change.

No.
Nicolas George Oct. 28, 2017, 11:46 a.m. UTC | #4 
Le septidi 7 brumaire, an CCXXVI, Paul B Mahol a écrit :
> No.

Yes. Sixteen hours is unacceptable.
Paul B Mahol Oct. 28, 2017, 4:05 p.m. UTC | #5 
On 10/28/17, Nicolas George <george@nsup.org> wrote:
> Le septidi 7 brumaire, an CCXXVI, Paul B Mahol a ecrit :
>> No.
>
> Yes. Sixteen hours is unacceptable.

When you will retire?
Nicolas George Oct. 30, 2017, 11:50 a.m. UTC | #6 
Le sextidi 6 brumaire, an CCXXVI, Paul B Mahol a écrit :
> Signed-off-by: Paul B Mahol <onemda@gmail.com>
> ---
>  libavfilter/avfilter.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
> index bc9e60bb85..b98b32bacb 100644
> --- a/libavfilter/avfilter.c
> +++ b/libavfilter/avfilter.c
> @@ -1532,7 +1532,7 @@ int ff_inlink_consume_samples(AVFilterLink *link, unsigned min, unsigned max,
>          return 0;
>      if (link->status_in)
>          min = FFMIN(min, ff_framequeue_queued_samples(&link->fifo));
> -    ret = take_samples(link, min, link->max_samples, &frame);
> +    ret = take_samples(link, min, max, &frame);
>      if (ret < 0)
>          return ret;
>      consume_update(link, frame);

Ok.

Regards,
diff mbox

Patch

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index bc9e60bb85..b98b32bacb 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -1532,7 +1532,7 @@  int ff_inlink_consume_samples(AVFilterLink *link, unsigned min, unsigned max,
         return 0;
     if (link->status_in)
         min = FFMIN(min, ff_framequeue_queued_samples(&link->fifo));
-    ret = take_samples(link, min, link->max_samples, &frame);
+    ret = take_samples(link, min, max, &frame);
     if (ret < 0)
         return ret;
     consume_update(link, frame);