diff mbox series

[FFmpeg-devel,4/4] fftools/ffmpeg_enc: simplify error handling for decoded_side_data setup

Message ID 20240323130409.20925-4-anton@khirnov.net
State Accepted
Commit 8fc1e1358b074d2e3655177faee8cde5857d59af
Headers show
Series [FFmpeg-devel,1/4] lavu/frame: add side data descriptors | expand

Checks

Context Check Description
yinshiyou/configure_loongarch64 warning Failed to apply patch
andriy/configure_x86 warning Failed to apply patch

Commit Message

Anton Khirnov March 23, 2024, 1:04 p.m. UTC 
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 mbox series

Patch

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;
-            }
         }
     }