diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-19 20:50:40 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-19 20:51:34 +0400 |
| commit | 4a2fd251f477447cdd4f7ee14f3670a7f1f0c4ed (patch) | |
| tree | d87cb3e6be5126ba2713f45b99cf5c8e93303486 /libavcodec/avpacket.c | |
| parent | 999a99c865cc12cc69240029b8a280b5ba170b52 (diff) | |
| parent | cdf58f0599c39852ee3beafe5f64af7d57d4215b (diff) | |
Merge commit 'cdf58f0599c39852ee3beafe5f64af7d57d4215b'
* commit 'cdf58f0599c39852ee3beafe5f64af7d57d4215b':
avpacket: fix copying side data in av_packet_copy_props()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avpacket.c')
| -rw-r--r-- | libavcodec/avpacket.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index 93efcec061..959d95963a 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -507,7 +507,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; |