[FFmpeg-cvslog] avformat/matroskaenc: remove accidental variable shadowing

James Almer git at videolan.org
Sat May 20 15:30:50 EEST 2023


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat May 20 09:28:46 2023 -0300| [efdc6e8200e61b5f00c7074f0d061157b550afb2] | committer: James Almer

avformat/matroskaenc: remove accidental variable shadowing

Should fix use of uninitialized value in a failure path.

Signed-off-by: James Almer <jamrial at gmail.com>

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

 libavformat/matroskaenc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 492b86b8d7..41e13b273d 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -2697,8 +2697,8 @@ static int mkv_write_block(void *logctx, MatroskaMuxContext *mkv,
     if (side_data && side_data_size) {
         uint8_t *payload;
         size_t payload_size, buf_size;
-        int ret = av_dynamic_hdr_plus_to_t35((AVDynamicHDRPlus *)side_data, NULL,
-                                             &payload_size);
+        ret = av_dynamic_hdr_plus_to_t35((AVDynamicHDRPlus *)side_data, NULL,
+                                         &payload_size);
         if (ret < 0)
             return ret;
 



More information about the ffmpeg-cvslog mailing list