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/mux.c | |
parent | 856b19d5935b544e96156f8e75e23b28c0a9f318 (diff) | |
parent | ce70f28a1732c74a9cd7fec2d56178750bd6e457 (diff) |
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/mux.c')
-rw-r--r-- | libavformat/mux.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/mux.c b/libavformat/mux.c index c60cbda6fb..b2d843bc38 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -923,7 +923,7 @@ static int interleave_packet(AVFormatContext *s, AVPacket *out, AVPacket *in, in if (s->oformat->interleave_packet) { int ret = s->oformat->interleave_packet(s, out, in, flush); if (in) - av_free_packet(in); + av_packet_unref(in); return ret; } else return ff_interleave_packet_per_dts(s, out, in, flush); @@ -971,7 +971,7 @@ int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt) if (ret >= 0) s->streams[opkt.stream_index]->nb_frames++; - av_free_packet(&opkt); + av_packet_unref(&opkt); if (ret < 0) return ret; @@ -999,7 +999,7 @@ int av_write_trailer(AVFormatContext *s) if (ret >= 0) s->streams[pkt.stream_index]->nb_frames++; - av_free_packet(&pkt); + av_packet_unref(&pkt); if (ret < 0) goto fail; |