[FFmpeg-cvslog] Use ff_packet_free_side_data instead of duplicating it.

Reimar Döffinger git at videolan.org
Tue Jan 17 22:16:42 CET 2012


ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger at gmx.de> | Tue Jan 17 20:34:26 2012 +0100| [178f8ea76e52f79e2b7f4a01973d11f5c518f915] | committer: Reimar Döffinger

Use ff_packet_free_side_data instead of duplicating it.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger at gmx.de>

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

 libavcodec/utils.c |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index ccccd54..57e5fb9 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1121,13 +1121,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);



More information about the ffmpeg-cvslog mailing list