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

demux_mkv: replace deprecated av_copy_packet_side_data() 

It's deprecated, and av_packet_copy_props() is nearly equivalent. It's
also more widely supported.
This commit is contained in:
wm4 2017-10-03 14:45:18 +02:00
parent 6132323911
commit 4e5d7cbf21
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
demux/demux_mkv.c
View File

@ -2448,12 +2448,10 @@ static void mkv_parse_and_add_packet(demuxer_t *demuxer, mkv_track_t *track,
struct demux_packet *new = new_demux_packet_from(data, size); struct demux_packet *new = new_demux_packet_from(data, size);
if (!new) if (!new)
break; break;
demux_packet_copy_attribs(new, dp);
#if LIBAVCODEC_VERSION_MICRO >= 100
if (copy_sidedata) if (copy_sidedata)
av_copy_packet_side_data(new->avpacket, dp->avpacket); av_packet_copy_props(new->avpacket, dp->avpacket);
#endif
copy_sidedata = false; copy_sidedata = false;
demux_packet_copy_attribs(new, dp);
if (track->parse_timebase) { if (track->parse_timebase) {
new->pts = track->av_parser->pts == AV_NOPTS_VALUE new->pts = track->av_parser->pts == AV_NOPTS_VALUE
? MP_NOPTS_VALUE : track->av_parser->pts / tb; ? MP_NOPTS_VALUE : track->av_parser->pts / tb;