[FFmpeg-cvslog] avcodec/libopusenc: Don't free user-provided AVPacket

Andreas Rheinhardt git at videolan.org
Sat May 23 22:56:52 EEST 2020


ffmpeg | branch: release/2.8 | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Sat May 23 11:40:23 2020 +0200| [49a9b454b389c18b8ebf65e91cb31c768c10802d] | committer: Andreas Rheinhardt

avcodec/libopusenc: Don't free user-provided AVPacket

Reviewed-by: James Almer <jamrial at gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
(cherry picked from commit b803993b6d99423c8c1e01e7e206e3916a98d5d5)

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

 libavcodec/libopusenc.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/libavcodec/libopusenc.c b/libavcodec/libopusenc.c
index a170b711c6..ec3acb5f92 100644
--- a/libavcodec/libopusenc.c
+++ b/libavcodec/libopusenc.c
@@ -362,7 +362,6 @@ static int libopus_encode(AVCodecContext *avctx, AVPacket *avpkt,
     // Check if subtraction resulted in an overflow
     if ((discard_padding < opus->opts.packet_size) != (avpkt->duration > 0)) {
         av_free_packet(avpkt);
-        av_free(avpkt);
         return AVERROR(EINVAL);
     }
     if (discard_padding > 0) {
@@ -371,7 +370,6 @@ static int libopus_encode(AVCodecContext *avctx, AVPacket *avpkt,
                                                      10);
         if(!side_data) {
             av_free_packet(avpkt);
-            av_free(avpkt);
             return AVERROR(ENOMEM);
         }
         AV_WL32(side_data + 4, discard_padding);



More information about the ffmpeg-cvslog mailing list