RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "demux/packet: fix demux_packet_shorten" 

This reverts commit 95636c65e7.

This change shouldn't be needed, and in fact it's wrong. The FFmpeg API
function could do anything it wants with the packet, including changing
the packet data pointer. Likewise, it's not guaranteed that the
referenced packet's fields mirror the current state of the mpv packet
struct (the AVPacket is only kept for the AVBuffer and the side data
stuff).
This commit is contained in:
wm4 2019-09-19 17:38:35 +02:00
parent e60bcf0d98
commit 9a7a6958ca
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
demux/packet.c
View File

@ -124,8 +124,8 @@ struct demux_packet *new_demux_packet(size_t len)
void demux_packet_shorten(struct demux_packet *dp, size_t len) void demux_packet_shorten(struct demux_packet *dp, size_t len)
{ {
assert(len <= dp->len); assert(len <= dp->len);
av_shrink_packet(dp->avpacket, len); dp->len = len;
dp->len = dp->avpacket->size; memset(dp->buffer + dp->len, 0, AV_INPUT_BUFFER_PADDING_SIZE);
} }
void free_demux_packet(struct demux_packet *dp) void free_demux_packet(struct demux_packet *dp)