From c363843a53553cbda6d42d98e8fbd165eda193fb Mon Sep 17 00:00:00 2001 From: Andreas Cadhalpun Date: Sat, 8 Aug 2015 10:41:30 +0200 Subject: add missing FF_API_DESTRUCT_PACKET guards Reviewed-by: wm4 Signed-off-by: Andreas Cadhalpun --- ffmpeg.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'ffmpeg.c') diff --git a/ffmpeg.c b/ffmpeg.c index b84fb1534c..ae02b00784 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -693,7 +693,13 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, OutputStream *ost) &new_pkt.data, &new_pkt.size, pkt->data, pkt->size, pkt->flags & AV_PKT_FLAG_KEY); - if(a == 0 && new_pkt.data != pkt->data && new_pkt.destruct) { +FF_DISABLE_DEPRECATION_WARNINGS + if(a == 0 && new_pkt.data != pkt->data +#if FF_API_DESTRUCT_PACKET + && new_pkt.destruct +#endif + ) { +FF_ENABLE_DEPRECATION_WARNINGS uint8_t *t = av_malloc(new_pkt.size + AV_INPUT_BUFFER_PADDING_SIZE); //the new should be a subset of the old so cannot overflow if(t) { memcpy(t, new_pkt.data, new_pkt.size); -- cgit v1.2.3