[SCM] libav/master: avpacket: fix copying side data in av_packet_copy_props()

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4ec1acc6e4f4d0bd28617bbb30ebfb779ce7df92
Author: Anton Khirnov <anton at khirnov.net>
Date:   Sun May 18 21:16:47 2014 +0200

    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 at libav.org
    (cherry picked from commit cdf58f0599c39852ee3beafe5f64af7d57d4215b)
    Signed-off-by: Luca Barbato <lu_zero at gentoo.org>

diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c
index c0a0f8c..052aaf8 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;

-- 
Libav/FFmpeg packaging