diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-27 14:28:56 +0100 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-27 14:28:56 +0100 |
commit | 7f5af80ba42bbd82da53dfd95236e9d47159a96a (patch) | |
tree | f85abbee087fa12065f02278c710ea4830c2cae5 /libavformat/matroskaenc.c | |
parent | 856b19d5935b544e96156f8e75e23b28c0a9f318 (diff) | |
parent | ce70f28a1732c74a9cd7fec2d56178750bd6e457 (diff) | |
download | ffmpeg-7f5af80ba42bbd82da53dfd95236e9d47159a96a.tar.gz |
Merge commit 'ce70f28a1732c74a9cd7fec2d56178750bd6e457'
* commit 'ce70f28a1732c74a9cd7fec2d56178750bd6e457':
avpacket: Replace av_free_packet with av_packet_unref
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavformat/matroskaenc.c')
-rw-r--r-- | libavformat/matroskaenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 1fb39fe10b..b41888f335 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1934,7 +1934,7 @@ static int mkv_write_packet(AVFormatContext *s, AVPacket *pkt) // for DASH audio, a CuePoint has to be added when there is a new cluster. ret = mkv_write_packet_internal(s, &mkv->cur_audio_pkt, mkv->is_dash ? start_new_cluster : 0); - av_free_packet(&mkv->cur_audio_pkt); + av_packet_unref(&mkv->cur_audio_pkt); if (ret < 0) { av_log(s, AV_LOG_ERROR, "Could not write cached audio packet ret:%d\n", ret); @@ -1993,7 +1993,7 @@ static int mkv_write_trailer(AVFormatContext *s) // check if we have an audio packet cached if (mkv->cur_audio_pkt.size > 0) { ret = mkv_write_packet_internal(s, &mkv->cur_audio_pkt, 0); - av_free_packet(&mkv->cur_audio_pkt); + av_packet_unref(&mkv->cur_audio_pkt); if (ret < 0) { av_log(s, AV_LOG_ERROR, "Could not write cached audio packet ret:%d\n", ret); |