Re: [FFmpeg-devel] [PATCH 04/10] fftools/ffmpeg_sched: Explicitly return 0 on sch_enc_send() success

[Andreas Rheinhardt <andreas.rheinhardt@outlook.com>]

Andreas Rheinhardt:
> Do not return the return value of the last enc_send_to_dst()
> call, as this would treat the last call differently from the
> earlier calls; furthermore, sch_enc_send() explicitly documents
> to always return 0 on success.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  fftools/ffmpeg_sched.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/fftools/ffmpeg_sched.c b/fftools/ffmpeg_sched.c
> index ec88017e21..30b2355eb6 100644
> --- a/fftools/ffmpeg_sched.c
> +++ b/fftools/ffmpeg_sched.c
> @@ -2344,15 +2344,13 @@ int sch_enc_send(Scheduler *sch, unsigned enc_idx, AVPacket *pkt)
>          ret = enc_send_to_dst(sch, enc->dst[i], finished, to_send);
>          if (ret < 0) {
>              av_packet_unref(to_send);
> -            if (ret == AVERROR_EOF) {
> -                ret = 0;
> +            if (ret == AVERROR_EOF)
>                  continue;
> -            }
>              return ret;
>          }
>      }
>  
> -    return ret;
> +    return 0;
>  }
>  
>  static int enc_done(Scheduler *sch, unsigned enc_idx)

Will apply patches 4-12 of this patchset tomorrow unless there are
objections.

- Andreas

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".