summaryrefslogtreecommitdiff
path: root/libavformat/mxg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-08-03 10:08:30 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-08-03 10:08:30 +0200
commit20be5e0a0e7563671efe0f085c9f160ff09ba494 (patch)
tree4db1a4e402d97dae295a0c6607726f0f192c0556 /libavformat/mxg.c
parent038c4f65ee6c72f9d1ee4d4e46c74073992fabc8 (diff)
parent7950e519bb094897f957b9a9531cc60ba46cbc91 (diff)
downloadffmpeg-20be5e0a0e7563671efe0f085c9f160ff09ba494.tar.gz
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/mxg.c')
-rw-r--r--libavformat/mxg.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/mxg.c b/libavformat/mxg.c
index 3a6cf77b26..b2b5b86c6f 100644
--- a/libavformat/mxg.c
+++ b/libavformat/mxg.c
@@ -20,6 +20,7 @@
*/
#include "libavutil/channel_layout.h"
+#include "libavutil/internal.h"
#include "libavutil/intreadwrite.h"
#include "libavcodec/mjpeg.h"
#include "avformat.h"
@@ -171,7 +172,9 @@ static int mxg_read_packet(AVFormatContext *s, AVPacket *pkt)
pkt->pts = pkt->dts = mxg->dts;
pkt->stream_index = 0;
#if FF_API_DESTRUCT_PACKET
+FF_DISABLE_DEPRECATION_WARNINGS
pkt->destruct = NULL;
+FF_ENABLE_DEPRECATION_WARNINGS
#endif
pkt->buf = NULL;
pkt->size = mxg->buffer_ptr - mxg->soi_ptr;
@@ -212,7 +215,9 @@ static int mxg_read_packet(AVFormatContext *s, AVPacket *pkt)
pkt->pts = pkt->dts = AV_RL64(startmarker_ptr + 8);
pkt->stream_index = 1;
#if FF_API_DESTRUCT_PACKET
+FF_DISABLE_DEPRECATION_WARNINGS
pkt->destruct = NULL;
+FF_ENABLE_DEPRECATION_WARNINGS
#endif
pkt->buf = NULL;
pkt->size = size - 14;