From: Anton Khirnov <anton@khirnov.net>
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH 4/4] fftools/ffmpeg_enc: simplify error handling for decoded_side_data setup
Date: Sat, 23 Mar 2024 14:04:09 +0100
Message-ID: <20240323130409.20925-4-anton@khirnov.net> (raw)
In-Reply-To: <20240323130409.20925-1-anton@khirnov.net>
There is no need to free the already-added items, they will be freed
alongside the codec context. There is also little point in an error
message, as the only reason this can fail is malloc failure.
---
fftools/ffmpeg_enc.c | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c
index 61310c67f1..9103fb74c0 100644
--- a/fftools/ffmpeg_enc.c
+++ b/fftools/ffmpeg_enc.c
@@ -198,15 +198,8 @@ int enc_open(void *opaque, const AVFrame *frame)
&enc_ctx->nb_decoded_side_data,
frame->side_data[i],
AV_FRAME_SIDE_DATA_FLAG_UNIQUE);
- if (ret < 0) {
- av_frame_side_data_free(
- &enc_ctx->decoded_side_data,
- &enc_ctx->nb_decoded_side_data);
- av_log(NULL, AV_LOG_ERROR,
- "failed to configure video encoder: %s!\n",
- av_err2str(ret));
+ if (ret < 0)
return ret;
- }
}
}
--
2.43.0
_______________________________________________
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-23 13:06 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-23 13:04 [FFmpeg-devel] [PATCH 1/4] lavu/frame: add side data descriptors Anton Khirnov
2024-03-23 13:04 ` [FFmpeg-devel] [PATCH 2/4] fftools/ffmpeg_enc: only promote first frame side data to global when meaningful Anton Khirnov
2024-03-23 13:15 ` Andreas Rheinhardt
2024-03-23 13:19 ` Anton Khirnov
2024-03-23 13:21 ` Andreas Rheinhardt
2024-03-23 13:04 ` [FFmpeg-devel] [PATCH 3/4] fftools/ffmpeg_enc: move decoded_side_data setup out of video-only block Anton Khirnov
2024-03-23 13:04 ` Anton Khirnov [this message]
2024-03-26 21:38 ` [FFmpeg-devel] [PATCH 1/4] lavu/frame: add side data descriptors James Almer
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=20240323130409.20925-4-anton@khirnov.net \
--to=anton@khirnov.net \
--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