[FFmpeg-cvslog] avformat/amr: Don't reset AVFormatContext.priv_data
Andreas Rheinhardt
git at videolan.org
Sat Jan 8 20:45:23 EET 2022
ffmpeg | branch: release/5.0 | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Thu Jan 6 11:33:31 2022 +0100| [24f1997822026c442914ffc2141c195f072466e5] | committer: Andreas Rheinhardt
avformat/amr: Don't reset AVFormatContext.priv_data
The AMR muxer doesn't have a private context, so it's priv_data
will be NULL. If it weren't, simply setting it to NULL would lead
to a memleak.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
(cherry picked from commit a5a99cc11c7aea587c871d6ca3fc80d9f9828e27)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=24f1997822026c442914ffc2141c195f072466e5
---
libavformat/amr.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/libavformat/amr.c b/libavformat/amr.c
index 9250089cb1..8e14052200 100644
--- a/libavformat/amr.c
+++ b/libavformat/amr.c
@@ -53,8 +53,6 @@ static int amr_write_header(AVFormatContext *s)
AVIOContext *pb = s->pb;
AVCodecParameters *par = s->streams[0]->codecpar;
- s->priv_data = NULL;
-
if (par->codec_id == AV_CODEC_ID_AMR_NB) {
avio_write(pb, AMR_header, sizeof(AMR_header) - 1); /* magic number */
} else if (par->codec_id == AV_CODEC_ID_AMR_WB) {
More information about the ffmpeg-cvslog
mailing list