diff options
author | wm4 <wm4@nowhere> | 2017-10-03 14:45:18 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2017-10-03 14:45:18 +0200 |
commit | 4e5d7cbf2134d891a0cb48318b01c1a7133938a2 (patch) | |
tree | 8fdcb0fecf0ca08a62e70551eb660cfd76da3193 /demux | |
parent | 61323239117359de4ece2d382cb9142f8abf2620 (diff) | |
download | mpv-4e5d7cbf2134d891a0cb48318b01c1a7133938a2.tar.bz2 mpv-4e5d7cbf2134d891a0cb48318b01c1a7133938a2.tar.xz |
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.
Diffstat (limited to 'demux')
-rw-r--r-- | demux/demux_mkv.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c index 4b9551adae..3256c5f389 100644 --- a/demux/demux_mkv.c +++ b/demux/demux_mkv.c @@ -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); if (!new) break; - demux_packet_copy_attribs(new, dp); -#if LIBAVCODEC_VERSION_MICRO >= 100 if (copy_sidedata) - av_copy_packet_side_data(new->avpacket, dp->avpacket); -#endif + av_packet_copy_props(new->avpacket, dp->avpacket); copy_sidedata = false; + demux_packet_copy_attribs(new, dp); if (track->parse_timebase) { new->pts = track->av_parser->pts == AV_NOPTS_VALUE ? MP_NOPTS_VALUE : track->av_parser->pts / tb; |