diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 16:50:09 +0200 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-05 16:50:09 +0200 |
commit | 87c88122703f2befcf96383d05bdf14373c22df9 (patch) | |
tree | 440194d29f606b9926ad57b9a15d0709ee12ccd7 /libavformat/mux.c | |
parent | b27ddffbfb29f456d43c2f155eef5230b940a48b (diff) | |
parent | 01bcc2d5c23fa757d163530abb396fd02f1be7c8 (diff) | |
download | ffmpeg-streaming-87c88122703f2befcf96383d05bdf14373c22df9.zip ffmpeg-streaming-87c88122703f2befcf96383d05bdf14373c22df9.tar.gz |
Merge commit '01bcc2d5c23fa757d163530abb396fd02f1be7c8'
* commit '01bcc2d5c23fa757d163530abb396fd02f1be7c8':
lavc: Drop deprecated destruct_packet related functions
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavformat/mux.c')
-rw-r--r-- | libavformat/mux.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libavformat/mux.c b/libavformat/mux.c index 8d5867c..a57b696 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -736,11 +736,6 @@ int ff_interleave_add_packet(AVFormatContext *s, AVPacket *pkt, if (!this_pktl) return AVERROR(ENOMEM); this_pktl->pkt = *pkt; -#if FF_API_DESTRUCT_PACKET -FF_DISABLE_DEPRECATION_WARNINGS - pkt->destruct = NULL; // do not free original but only the copy -FF_ENABLE_DEPRECATION_WARNINGS -#endif pkt->buf = NULL; pkt->side_data = NULL; pkt->side_data_elems = 0; |