From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> To: ffmpeg-devel@ffmpeg.org Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Subject: [FFmpeg-devel] [PATCH 04/10] fftools/ffmpeg_sched: Explicitly return 0 on sch_enc_send() success Date: Mon, 25 Mar 2024 02:53:18 +0100 Message-ID: <GV1P250MB0737CB016AED3D3E999FC85F8F362@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM> (raw) In-Reply-To: <GV1P250MB073784B8A168B66DF3CB720D8F362@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM> 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) -- 2.40.1 _______________________________________________ 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".
next prev parent reply other threads:[~2024-03-25 1:53 UTC|newest] Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-03-25 1:51 [FFmpeg-devel] [PATCH 01/10] doc/examples: Always use <> includes Andreas Rheinhardt 2024-03-25 1:53 ` [FFmpeg-devel] [PATCH 02/10] avutil/fifo, file: Remove unused headers Andreas Rheinhardt 2024-03-26 16:44 ` Stefano Sabatini 2024-03-25 1:53 ` [FFmpeg-devel] [PATCH 03/10] avutil/common: Don't auto-include mem.h Andreas Rheinhardt 2024-03-25 21:18 ` Michael Niedermayer 2024-03-25 21:27 ` Andreas Rheinhardt 2024-03-25 1:53 ` Andreas Rheinhardt [this message] 2024-03-27 16:16 ` [FFmpeg-devel] [PATCH 04/10] fftools/ffmpeg_sched: Explicitly return 0 on sch_enc_send() success Andreas Rheinhardt 2024-03-25 1:53 ` [FFmpeg-devel] [PATCH 05/10] avcodec/wmaprodec: Explicitly return 0 on success Andreas Rheinhardt 2024-03-25 1:53 ` [FFmpeg-devel] [PATCH 06/10] avcodec/ratecontrol: Avoid function pointer casts Andreas Rheinhardt 2024-03-25 1:53 ` [FFmpeg-devel] [PATCH 07/10] avcodec/bfi: Remove unused AVCodecContext* from context Andreas Rheinhardt 2024-03-25 1:53 ` [FFmpeg-devel] [PATCH 08/10] avcodec/mjpegenc: Inline chroma subsampling Andreas Rheinhardt 2024-03-25 1:53 ` [FFmpeg-devel] [PATCH 09/10] avcodec/magicyuvenc: Don't call functions twice due to macro Andreas Rheinhardt 2024-03-25 1:53 ` [FFmpeg-devel] [PATCH 10/10] avcodec/profiles: Don't include avcodec.h Andreas Rheinhardt 2024-03-25 12:56 ` [FFmpeg-devel] [PATCH 11/11] avutil/opt: Avoid av_strdup(NULL) Andreas Rheinhardt 2024-03-25 15:11 ` [FFmpeg-devel] [PATCH 12/12] avutil/opt: Don't cast when the result might be misaligned Andreas Rheinhardt 2024-03-25 16:33 ` [FFmpeg-devel] [PATCH 13/13] fftools/ffmpeg_mux_init: Fix double-free on error Andreas Rheinhardt 2024-03-25 21:33 ` Marth64 2024-03-25 16:38 ` [FFmpeg-devel] [PATCH 14/14] avutil/avstring: Avoid av_strdup(NULL) Andreas Rheinhardt 2024-03-25 16:50 ` Vittorio Giovara 2024-03-25 16:55 ` Andreas Rheinhardt 2024-03-25 18:15 ` Vittorio Giovara 2024-03-25 18:18 ` James Almer 2024-03-25 18:24 ` Andreas Rheinhardt 2024-03-26 16:43 ` [FFmpeg-devel] [PATCH 01/10] doc/examples: Always use <> includes Stefano Sabatini
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=GV1P250MB0737CB016AED3D3E999FC85F8F362@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM \ --to=andreas.rheinhardt@outlook.com \ --cc=ffmpeg-devel@ffmpeg.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel This inbox may be cloned and mirrored by anyone: git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \ ffmpegdev@gitmailbox.com public-inbox-index ffmpegdev Example config snippet for mirrors. AGPL code for this site: git clone https://public-inbox.org/public-inbox.git