summaryrefslogtreecommitdiffstats
path: root/demux
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-03-16 10:16:05 +0100
committerwm4 <wm4@nowhere>2014-03-16 13:19:28 +0100
commitc9d328319ebe88fcb3a978252c72ca762cfdaecd (patch)
tree954906acc50909b756e1dc91e0b4d95a07b7d85b /demux
parent64c01a814c8f7cf4a780b89fe00ed608b1f93e2b (diff)
downloadmpv-c9d328319ebe88fcb3a978252c72ca762cfdaecd.tar.bz2
mpv-c9d328319ebe88fcb3a978252c72ca762cfdaecd.tar.xz
demux: use av_packet_ref()
av_copy_packet() was FFmpeg specific, av_packet_ref() is now available on all supported libavcodec releases.
Diffstat (limited to 'demux')
-rw-r--r--demux/demux.c5
1 files changed, 1 insertions, 4 deletions
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);