summaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2019-10-16 03:57:09 +0200
committerJames Almer <jamrial@gmail.com>2019-10-21 20:35:54 -0300
commit7797fdfe6f33a7fc35ec147edcb7d1aac47b4a75 (patch)
tree7cd6780f640874cf02820ef28cf156499c211a53 /libavformat
parent982a98a0e3414109647f885baee1196ee4ffb455 (diff)
downloadffmpeg-streaming-7797fdfe6f33a7fc35ec147edcb7d1aac47b4a75.zip
ffmpeg-streaming-7797fdfe6f33a7fc35ec147edcb7d1aac47b4a75.tar.gz
avformat/matroskaenc: Use ffio_free_dyn_buf
instead of replicating its behaviour. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/matroskaenc.c23
1 files changed, 6 insertions, 17 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 3f9bd34..b924a64 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -391,23 +391,12 @@ static void put_xiph_size(AVIOContext *pb, int size)
static void mkv_deinit(AVFormatContext *s)
{
MatroskaMuxContext *mkv = s->priv_data;
- uint8_t* buf;
- if (mkv->cluster_bc) {
- avio_close_dyn_buf(mkv->cluster_bc, &buf);
- av_free(buf);
- }
- if (mkv->info_bc) {
- avio_close_dyn_buf(mkv->info_bc, &buf);
- av_free(buf);
- }
- if (mkv->tracks_bc) {
- avio_close_dyn_buf(mkv->tracks_bc, &buf);
- av_free(buf);
- }
- if (mkv->tags_bc) {
- avio_close_dyn_buf(mkv->tags_bc, &buf);
- av_free(buf);
- }
+
+ ffio_free_dyn_buf(&mkv->cluster_bc);
+ ffio_free_dyn_buf(&mkv->info_bc);
+ ffio_free_dyn_buf(&mkv->tracks_bc);
+ ffio_free_dyn_buf(&mkv->tags_bc);
+
if (mkv->seekhead) {
av_freep(&mkv->seekhead->entries);
av_freep(&mkv->seekhead);
OpenPOWER on IntegriCloud