avcodec: Remove redundant freeing of extradata of encoders

AVCodecContext.extradata is freed generically by libavcodec for
encoders, so it is unnecessary for an encoder to do it on its own.

Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>

diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c
index caa9092314853a155d9368ec66d28344ee1171e8..12896de262f3cdda5eca57f9ff4058174de0b74d 100644 (file)
--- a/libavcodec/flacenc.c
+++ b/libavcodec/flacenc.c
@@ -1413,8 +1413,6 @@ static av_cold int flac_encode_close(AVCodecContext *avctx)
         av_freep(&s->md5_buffer);
         ff_lpc_end(&s->lpc_ctx);
     }
-    av_freep(&avctx->extradata);
-    avctx->extradata_size = 0;
     return 0;
 }
 

diff --git a/libavcodec/huffyuvenc.c b/libavcodec/huffyuvenc.c
index 6e08a94d4169b9859ac01cd11a28c6d9fa7c4e54..a67b89b49bcf3da82374fcf201247293004ea031 100644 (file)
--- a/libavcodec/huffyuvenc.c
+++ b/libavcodec/huffyuvenc.c
@@ -1005,7 +1005,6 @@ static av_cold int encode_end(AVCodecContext *avctx)
 
     ff_huffyuv_common_end(s);
 
-    av_freep(&avctx->extradata);
     av_freep(&avctx->stats_out);
 
     return 0;

diff --git a/libavcodec/lclenc.c b/libavcodec/lclenc.c
index 94842797713cf3ddc802f32ce0b170cc29acae63..3eee95fa0401afa759128e0a33260fc265e14d1e 100644 (file)
--- a/libavcodec/lclenc.c
+++ b/libavcodec/lclenc.c
@@ -154,7 +154,6 @@ static av_cold int encode_end(AVCodecContext *avctx)
 {
     LclEncContext *c = avctx->priv_data;
 
-    av_freep(&avctx->extradata);
     deflateEnd(&c->zstream);
 
     return 0;

diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c
index b848cd8851fb5a0283e344fed2913bfe590c3c96..a7144e95dde0c25cd02c2e51b971ca73ddc33790 100644 (file)
--- a/libavcodec/libfdk-aacenc.c
+++ b/libavcodec/libfdk-aacenc.c
@@ -112,7 +112,6 @@ static int aac_encode_close(AVCodecContext *avctx)
 
     if (s->handle)
         aacEncClose(&s->handle);
-    av_freep(&avctx->extradata);
     ff_af_queue_close(&s->afq);
 
     return 0;

diff --git a/libavcodec/libkvazaar.c b/libavcodec/libkvazaar.c
index 54788e154beb9a4c913c0392fb6031e61dfb2f25..14eabe4e05a28651a359355e81e9d58fdb15ce09 100644 (file)
--- a/libavcodec/libkvazaar.c
+++ b/libavcodec/libkvazaar.c
@@ -156,9 +156,6 @@ static av_cold int libkvazaar_close(AVCodecContext *avctx)
         ctx->api->config_destroy(ctx->config);
     }
 
-    if (avctx->extradata)
-        av_freep(&avctx->extradata);
-
     return 0;
 }
 

diff --git a/libavcodec/libopusenc.c b/libavcodec/libopusenc.c
index 8c99b26ddf85fab48dd523cb92f9e1cce391347b..c642037aac4019f72a11eb33654a937f902a50c0 100644 (file)
--- a/libavcodec/libopusenc.c
+++ b/libavcodec/libopusenc.c
@@ -432,7 +432,6 @@ static av_cold int libopus_encode_init(AVCodecContext *avctx)
 
 fail:
     opus_multistream_encoder_destroy(enc);
-    av_freep(&avctx->extradata);
     return ret;
 }
 
@@ -538,7 +537,6 @@ static av_cold int libopus_encode_close(AVCodecContext *avctx)
     ff_af_queue_close(&opus->afq);
 
     av_freep(&opus->samples);
-    av_freep(&avctx->extradata);
 
     return 0;
 }

diff --git a/libavcodec/libspeexenc.c b/libavcodec/libspeexenc.c
index c96e2d87fdbccae4080b44782222be40a56eb0c1..a7891b367cecaf0ada6d3288b7c60009bce7010b 100644 (file)
--- a/libavcodec/libspeexenc.c
+++ b/libavcodec/libspeexenc.c
@@ -318,7 +318,6 @@ static av_cold int encode_close(AVCodecContext *avctx)
     speex_encoder_destroy(s->enc_state);
 
     ff_af_queue_close(&s->afq);
-    av_freep(&avctx->extradata);
 
     return 0;
 }

diff --git a/libavcodec/libtheoraenc.c b/libavcodec/libtheoraenc.c
index f26ab501f428d48bc56eeb15747cb1c60bfd1a5b..057cb9f0261a1c9daf688017642a5a9fd6910962 100644 (file)
--- a/libavcodec/libtheoraenc.c
+++ b/libavcodec/libtheoraenc.c
@@ -360,7 +360,6 @@ static av_cold int encode_close(AVCodecContext* avc_context)
     th_encode_free(h->t_state);
     av_freep(&h->stats);
     av_freep(&avc_context->stats_out);
-    av_freep(&avc_context->extradata);
     avc_context->extradata_size = 0;
 
     return 0;

diff --git a/libavcodec/libvorbisenc.c b/libavcodec/libvorbisenc.c
index 8999a18bf416e50877b5ea2f668d75040c92c9bb..d0f4c65aacc58b274f25da408d1cd8c31dfbd310 100644 (file)
--- a/libavcodec/libvorbisenc.c
+++ b/libavcodec/libvorbisenc.c
@@ -196,7 +196,6 @@ static av_cold int libvorbis_encode_close(AVCodecContext *avctx)
 
     av_fifo_freep(&s->pkt_fifo);
     ff_af_queue_close(&s->afq);
-    av_freep(&avctx->extradata);
 
     av_vorbis_parse_free(&s->vp);
 

diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index 2bed61f91e17512f8e9a491070cba4d8c1af483e..22c91d8df798a2fa049a9f6310c6669e0eb2d83d 100644 (file)
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -497,7 +497,6 @@ static av_cold int X264_close(AVCodecContext *avctx)
 {
     X264Context *x4 = avctx->priv_data;
 
-    av_freep(&avctx->extradata);
     av_freep(&x4->sei);
     av_freep(&x4->reordered_opaque);
 

diff --git a/libavcodec/libxavs.c b/libavcodec/libxavs.c
index 3135e221c7bd00e783636f6dce06ee5a5518b011..253f4bde6ad6f5e059547277a38de0c75cdb8c03 100644 (file)
--- a/libavcodec/libxavs.c
+++ b/libavcodec/libxavs.c
@@ -207,7 +207,6 @@ static av_cold int XAVS_close(AVCodecContext *avctx)
 {
     XavsContext *x4 = avctx->priv_data;
 
-    av_freep(&avctx->extradata);
     av_freep(&x4->sei);
     av_freep(&x4->pts_buffer);
 

diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c
index 7ba709b1bce92c3ff2a4ed46c7ee8b0d81ec1999..4c635ae86fb823ad872b755585149b3884a2f929 100644 (file)
--- a/libavcodec/libxvid.c
+++ b/libavcodec/libxvid.c
@@ -858,7 +858,6 @@ static av_cold int xvid_encode_close(AVCodecContext *avctx)
         x->encoder_handle = NULL;
     }
 
-    av_freep(&avctx->extradata);
     if (x->twopassbuffer) {
         av_freep(&x->twopassbuffer);
         av_freep(&x->old_twopassbuffer);

diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index b2b33a89c5085437b1b513429a2d77613e590505..c01488f483ada912a1d158115fc858e1d02cdcef 100644 (file)
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -961,8 +961,6 @@ av_cold int ff_mpv_encode_end(AVCodecContext *avctx)
         s->out_format == FMT_MJPEG)
         ff_mjpeg_encode_close(s);
 
-    av_freep(&avctx->extradata);
-
     for (i = 0; i < FF_ARRAY_ELEMS(s->tmp_frames); i++)
         av_frame_free(&s->tmp_frames[i]);
 

diff --git a/libavcodec/opusenc.c b/libavcodec/opusenc.c
index da83ef4d3215521991ad3ad26aecc1e01a2ec300..ac8a5d651cd18f23f619b4d2f39dc280b4efac99 100644 (file)
--- a/libavcodec/opusenc.c
+++ b/libavcodec/opusenc.c
@@ -614,7 +614,6 @@ static av_cold int opus_encode_end(AVCodecContext *avctx)
     ff_af_queue_close(&s->afq);
     ff_opus_psy_end(&s->psyctx);
     ff_bufqueue_discard_all(&s->bufqueue);
-    av_freep(&avctx->extradata);
 
     return 0;
 }

diff --git a/libavcodec/vorbisenc.c b/libavcodec/vorbisenc.c
index b89bb206e07d1a6cf521811539d05d2e5be6349a..1f7e9b3c91a20ef7d2a60bac44179d13af6f91c6 100644 (file)
--- a/libavcodec/vorbisenc.c
+++ b/libavcodec/vorbisenc.c
@@ -1254,8 +1254,6 @@ static av_cold int vorbis_encode_close(AVCodecContext *avctx)
     ff_af_queue_close(&venc->afq);
     ff_bufqueue_discard_all(&venc->bufqueue);
 
-    av_freep(&avctx->extradata);
-
     return 0 ;
 }