From 83a5df54eae6dddea7c453fd25c45c7b9c148925 Mon Sep 17 00:00:00 2001 From: Hendrik Leppkes Date: Sat, 5 Sep 2015 16:51:53 +0200 Subject: Remove left-over FF_API_DESTRUCT_PACKET cruft --- ffmpeg.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'ffmpeg.c') diff --git a/ffmpeg.c b/ffmpeg.c index d9b8c0bfff..76094575c9 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -692,13 +692,7 @@ 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); -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 + if(a == 0 && new_pkt.data != pkt->data) { 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