diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-03 10:08:30 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-03 10:08:30 +0200 |
commit | 20be5e0a0e7563671efe0f085c9f160ff09ba494 (patch) | |
tree | 4db1a4e402d97dae295a0c6607726f0f192c0556 /libavformat/avidec.c | |
parent | 038c4f65ee6c72f9d1ee4d4e46c74073992fabc8 (diff) | |
parent | 7950e519bb094897f957b9a9531cc60ba46cbc91 (diff) |
Merge commit '7950e519bb094897f957b9a9531cc60ba46cbc91'
* commit '7950e519bb094897f957b9a9531cc60ba46cbc91':
Disable deprecation warnings for cases where a replacement is available
Conflicts:
libavcodec/avpacket.c
libavcodec/pthread.c
libavcodec/utils.c
libavdevice/v4l2.c
libavfilter/avfiltergraph.c
libavfilter/buffersrc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avidec.c')
-rw-r--r-- | libavformat/avidec.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index af94fb382e..2827064331 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -24,6 +24,7 @@ #include "libavutil/bswap.h" #include "libavutil/opt.h" #include "libavutil/dict.h" +#include "libavutil/internal.h" #include "libavutil/intreadwrite.h" #include "libavutil/mathematics.h" #include "avformat.h" @@ -1268,12 +1269,16 @@ resync: if (CONFIG_DV_DEMUXER && avi->dv_demux) { AVBufferRef *avbuf = pkt->buf; #if FF_API_DESTRUCT_PACKET +FF_DISABLE_DEPRECATION_WARNINGS dstr = pkt->destruct; +FF_ENABLE_DEPRECATION_WARNINGS #endif size = avpriv_dv_produce_packet(avi->dv_demux, pkt, pkt->data, pkt->size, pkt->pos); #if FF_API_DESTRUCT_PACKET +FF_DISABLE_DEPRECATION_WARNINGS pkt->destruct = dstr; +FF_ENABLE_DEPRECATION_WARNINGS #endif pkt->buf = avbuf; pkt->flags |= AV_PKT_FLAG_KEY; |