diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-08 17:28:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-08 19:12:03 +0100 |
| commit | 2653e125204569b1e9439ee2671c6ebb23a94b80 (patch) | |
| tree | 4176f76bccc8cdd1c85b9d329a82867eda37d397 /libavformat/mux.c | |
| parent | 532f31a695c9530ce67a847be00d72e6e8acfd11 (diff) | |
| parent | 1afddbe59e96af75f1c07605afc95615569f388f (diff) | |
Merge commit '1afddbe59e96af75f1c07605afc95615569f388f'
* commit '1afddbe59e96af75f1c07605afc95615569f388f':
avpacket: use AVBuffer to allow refcounting the packets.
Conflicts:
libavcodec/avpacket.c
libavcodec/utils.c
libavdevice/v4l2.c
libavformat/avidec.c
libavformat/flacdec.c
libavformat/id3v2.c
libavformat/matroskaenc.c
libavformat/mux.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mux.c')
| -rw-r--r-- | libavformat/mux.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/mux.c b/libavformat/mux.c index 98ec7a4cf2..0d74d96ab8 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -540,7 +540,10 @@ int ff_interleave_add_packet(AVFormatContext *s, AVPacket *pkt, if (!this_pktl) return AVERROR(ENOMEM); this_pktl->pkt = *pkt; +#if FF_API_DESTRUCT_PACKET pkt->destruct = NULL; // do not free original but only the copy +#endif + pkt->buf = NULL; av_dup_packet(&this_pktl->pkt); // duplicate the packet if it uses non-allocated memory if (s->streams[pkt->stream_index]->last_in_packet_buffer) { |