summaryrefslogtreecommitdiff
path: root/libavformat/mux.c
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2013-03-27 18:36:51 +0100
committerDiego Biurrun <diego@biurrun.de>2013-08-02 19:19:02 +0200
commit7950e519bb094897f957b9a9531cc60ba46cbc91 (patch)
treeb8bcd2acc2a699c2c219e690d439a3f3eb0a6a44 /libavformat/mux.c
parent3a7050ffed5ce061b114a11e4de4b77aba8efa0b (diff)
Disable deprecation warnings for cases where a replacement is available
Diffstat (limited to 'libavformat/mux.c')
-rw-r--r--libavformat/mux.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/mux.c b/libavformat/mux.c
index eb91a5ccd3..5a08dd6c72 100644
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
@@ -31,6 +31,7 @@
#include "id3v2.h"
#include "libavutil/avassert.h"
#include "libavutil/avstring.h"
+#include "libavutil/internal.h"
#include "libavutil/mathematics.h"
#include "libavutil/parseutils.h"
#include "libavutil/time.h"
@@ -452,7 +453,9 @@ void ff_interleave_add_packet(AVFormatContext *s, AVPacket *pkt,
this_pktl = av_mallocz(sizeof(AVPacketList));
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;
av_dup_packet(&this_pktl->pkt); // duplicate the packet if it uses non-alloced memory