[FFmpeg-devel] [PATCH] Use ff_packet_free_side_data instead of duplicating it.

Reimar Döffinger Reimar.Doeffinger at gmx.de
Tue Jan 17 20:34:47 CET 2012


Signed-off-by: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
---
 libavcodec/utils.c |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index f2d31e6..c621fd9 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1123,13 +1123,7 @@ int attribute_align_arg avcodec_encode_audio(AVCodecContext *avctx,
         avctx->coded_frame->key_frame = !!(pkt.flags & AV_PKT_FLAG_KEY);
     }
     /* free any side data since we cannot return it */
-    if (pkt.side_data_elems > 0) {
-        int i;
-        for (i = 0; i < pkt.side_data_elems; i++)
-            av_free(pkt.side_data[i].data);
-        av_freep(&pkt.side_data);
-        pkt.side_data_elems = 0;
-    }
+    ff_packet_free_side_data(&pkt);
 
     if (frame && frame->extended_data != frame->data)
         av_freep(&frame->extended_data);
-- 
1.7.8.3



More information about the ffmpeg-devel mailing list