[FFmpeg-cvslog] avformat/movenc: remove call to av_copy_packet_side_data() when concatenating eac3 syncframes

James Almer git at videolan.org
Wed Apr 15 20:13:41 EEST 2020


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Apr 14 17:31:26 2020 -0300| [e7eb379d98f6b8be9b19afd71fc5b3473eca4a47] | committer: James Almer

avformat/movenc: remove call to av_copy_packet_side_data() when concatenating eac3 syncframes

This generates a potential memory leak, and mixes side data from the last
packet with other properties from the first.

Keep all the properties from the first packet only in the output packet
instead.

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

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

 libavformat/movenc.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index bc8d08044e..bf3e4fa2ce 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -520,8 +520,6 @@ concatenate:
         memcpy(info->pkt.data + info->pkt.size - pkt->size, pkt->data, pkt->size);
         info->num_blocks += num_blocks;
         info->pkt.duration += pkt->duration;
-        if ((ret = av_copy_packet_side_data(&info->pkt, pkt)) < 0)
-            goto end;
         if (info->num_blocks != 6)
             goto end;
         av_packet_unref(pkt);



More information about the ffmpeg-cvslog mailing list