Signed-off-by: Andreas Rheinhardt <[email protected]>
---
libavformat/aiffenc.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/libavformat/aiffenc.c b/libavformat/aiffenc.c
index dd8b8c3d01..0b837cd264 100644
--- a/libavformat/aiffenc.c
+++ b/libavformat/aiffenc.c
@@ -235,7 +235,7 @@ static int aiff_write_packet(AVFormatContext *s, AVPacket
*pkt)
static int aiff_write_trailer(AVFormatContext *s)
{
- int ret;
+ int ret = 0;
AVIOContext *pb = s->pb;
AIFFOutputContext *aiff = s->priv_data;
AVCodecParameters *par = s->streams[aiff->audio_stream_idx]->codecpar;
@@ -263,7 +263,7 @@ static int aiff_write_trailer(AVFormatContext *s)
/* Write ID3 tags */
if (aiff->write_id3v2)
if ((ret = put_id3v2_tags(s, aiff)) < 0)
- return ret;
+ goto free;
/* File length */
file_size = avio_tell(pb);
@@ -273,9 +273,10 @@ static int aiff_write_trailer(AVFormatContext *s)
avio_flush(pb);
}
+free:
ff_packet_list_free(&aiff->pict_list, &aiff->pict_list_end);
- return 0;
+ return ret;
}
#define OFFSET(x) offsetof(AIFFOutputContext, x)
--
2.21.0
_______________________________________________
ffmpeg-devel mailing list
[email protected]
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
[email protected] with subject "unsubscribe".
