[FFmpeg-cvslog] fftools/ffmpeg_sched: Explicitly return 0 on sch_enc_send() success

Andreas Rheinhardt git at videolan.org
Thu Mar 28 05:01:40 EET 2024


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Mon Mar 25 02:15:34 2024 +0100| [432e287e27efa3e9bb19f85cbd3d617e6f33c220] | committer: Andreas Rheinhardt

fftools/ffmpeg_sched: Explicitly return 0 on sch_enc_send() success

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 at outlook.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=432e287e27efa3e9bb19f85cbd3d617e6f33c220
---

 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)



More information about the ffmpeg-cvslog mailing list