RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-23 07:12:39 +00:00
Code Issues Releases Wiki Activity

demux: use av_packet_ref()

Browse Source 
av_copy_packet() was FFmpeg specific, av_packet_ref() is now available
on all supported libavcodec releases.
This commit is contained in:
wm4 2014-03-16 10:16:05 +01:00
parent 64c01a814c
commit c9d328319e
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
demux/demux.c
View File

@ -198,20 +198,17 @@ static void destroy_avpacket(void *pkt)
struct demux_packet *demux_copy_packet(struct demux_packet *dp) struct demux_packet *demux_copy_packet(struct demux_packet *dp)
{ {
struct demux_packet *new = NULL; struct demux_packet *new = NULL;
// No av_copy_packet() in Libav
#if LIBAVCODEC_VERSION_MICRO >= 100
if (dp->avpacket) { if (dp->avpacket) {
assert(dp->buffer == dp->avpacket->data); assert(dp->buffer == dp->avpacket->data);
assert(dp->len == dp->avpacket->size); assert(dp->len == dp->avpacket->size);
AVPacket *newavp = talloc_zero(NULL, AVPacket); AVPacket *newavp = talloc_zero(NULL, AVPacket);
talloc_set_destructor(newavp, destroy_avpacket); talloc_set_destructor(newavp, destroy_avpacket);
av_init_packet(newavp); av_init_packet(newavp);
if (av_copy_packet(newavp, dp->avpacket) < 0) if (av_packet_ref(newavp, dp->avpacket) < 0)
abort(); abort();
new = new_demux_packet_fromdata(newavp->data, newavp->size); new = new_demux_packet_fromdata(newavp->data, newavp->size);
new->avpacket = newavp; new->avpacket = newavp;
} }
#endif
if (!new) { if (!new) {
new = new_demux_packet(dp->len); new = new_demux_packet(dp->len);
memcpy(new->buffer, dp->buffer, new->len); memcpy(new->buffer, dp->buffer, new->len);