diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2016-02-28 23:31:51 +0100 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2016-02-28 23:31:51 +0100 |
| commit | 21cd4ff05bb46b375a9ad38c9f0b7f8e71a5d979 (patch) | |
| tree | b9679cc1d2c7c3cab0f88c370015f34f6d0b27ca /demux/packet.c | |
| parent | d1d6257731866934717353fce484f5f472f845d1 (diff) | |
| parent | 1f436f65f2ee4df6419ca68bd6426b8283db6d22 (diff) | |
| download | mpv-21cd4ff05bb46b375a9ad38c9f0b7f8e71a5d979.tar.bz2 mpv-21cd4ff05bb46b375a9ad38c9f0b7f8e71a5d979.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'demux/packet.c')
| -rw-r--r-- | demux/packet.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/demux/packet.c b/demux/packet.c index 22b111b0ce..32fabc4f78 100644 --- a/demux/packet.c +++ b/demux/packet.c @@ -49,6 +49,8 @@ struct demux_packet *new_demux_packet_from_avpacket(struct AVPacket *avpkt) .dts = MP_NOPTS_VALUE, .duration = -1, .pos = -1, + .start = MP_NOPTS_VALUE, + .end = MP_NOPTS_VALUE, .stream = -1, .avpacket = talloc_zero(dp, AVPacket), }; @@ -106,6 +108,9 @@ void demux_packet_copy_attribs(struct demux_packet *dst, struct demux_packet *sr dst->dts = src->dts; dst->duration = src->duration; dst->pos = src->pos; + dst->start = src->start; + dst->end = src->end; + dst->new_segment = src->new_segment; dst->keyframe = src->keyframe; dst->stream = src->stream; } |