From c9d328319ebe88fcb3a978252c72ca762cfdaecd Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 16 Mar 2014 10:16:05 +0100 Subject: demux: use av_packet_ref() av_copy_packet() was FFmpeg specific, av_packet_ref() is now available on all supported libavcodec releases. --- demux/demux.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'demux/demux.c') diff --git a/demux/demux.c b/demux/demux.c index c15d66a8d3..311a563b81 100644 --- a/demux/demux.c +++ b/demux/demux.c @@ -198,20 +198,17 @@ static void destroy_avpacket(void *pkt) struct demux_packet *demux_copy_packet(struct demux_packet *dp) { struct demux_packet *new = NULL; - // No av_copy_packet() in Libav -#if LIBAVCODEC_VERSION_MICRO >= 100 if (dp->avpacket) { assert(dp->buffer == dp->avpacket->data); assert(dp->len == dp->avpacket->size); AVPacket *newavp = talloc_zero(NULL, AVPacket); talloc_set_destructor(newavp, destroy_avpacket); av_init_packet(newavp); - if (av_copy_packet(newavp, dp->avpacket) < 0) + if (av_packet_ref(newavp, dp->avpacket) < 0) abort(); new = new_demux_packet_fromdata(newavp->data, newavp->size); new->avpacket = newavp; } -#endif if (!new) { new = new_demux_packet(dp->len); memcpy(new->buffer, dp->buffer, new->len); -- cgit v1.2.3