aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2014-05-18 21:16:47 +0200
committerLuca Barbato <lu_zero@gentoo.org>2014-06-26 12:58:16 +0200
commit4ec1acc6e4f4d0bd28617bbb30ebfb779ce7df92 (patch)
tree18f9fef5d7183080f50858c6f18a4898da34e6e6
parent74f6df745a05d3d8b3dcfc28992c69a70ae87957 (diff)
downloadffmpeg-4ec1acc6e4f4d0bd28617bbb30ebfb779ce7df92.tar.gz
avpacket: fix copying side data in av_packet_copy_props()
Side data count is incremented by by calling av_packet_new_side_data() in the following loop, setting it explicitly results in the resulting value being twice what it should be. CC: libav-stable@libav.org (cherry picked from commit cdf58f0599c39852ee3beafe5f64af7d57d4215b) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
-rw-r--r--libavcodec/avpacket.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c
index c0a0f8cd7b..052aaf8638 100644
--- a/libavcodec/avpacket.c
+++ b/libavcodec/avpacket.c
@@ -325,7 +325,6 @@ int av_packet_copy_props(AVPacket *dst, const AVPacket *src)
dst->convergence_duration = src->convergence_duration;
dst->flags = src->flags;
dst->stream_index = src->stream_index;
- dst->side_data_elems = src->side_data_elems;
for (i = 0; i < src->side_data_elems; i++) {
enum AVPacketSideDataType type = src->side_data[i].type;