From 3b4026e15110547892d5d770b6b43c9e34df458f Mon Sep 17 00:00:00 2001 From: Yusuke Nakamura Date: Wed, 14 Feb 2018 11:43:24 +0900 Subject: avpacket: reset dst side_data fields in av_packet_copy_props This effectively copies the side data elements from src instead of potentially merging them with those already existing in dst. This by extension also removes the only dependency on existing values in the dst packet. Reviewed-by: wm4 Signed-off-by: James Almer --- libavcodec/avpacket.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index 90b8215..fe8113a 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -571,6 +571,8 @@ FF_ENABLE_DEPRECATION_WARNINGS dst->flags = src->flags; dst->stream_index = src->stream_index; + dst->side_data = NULL; + dst->side_data_elems = 0; for (i = 0; i < src->side_data_elems; i++) { enum AVPacketSideDataType type = src->side_data[i].type; int size = src->side_data[i].size; -- cgit v1.1