Merge commit 'cdf58f0599c39852ee3beafe5f64af7d57d4215b'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 19 May 2014 16:50:40 +0000 (18:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 19 May 2014 16:51:34 +0000 (18:51 +0200)
commit4a2fd251f477447cdd4f7ee14f3670a7f1f0c4ed
treed87cb3e6be5126ba2713f45b99cf5c8e93303486
parent999a99c865cc12cc69240029b8a280b5ba170b52
parentcdf58f0599c39852ee3beafe5f64af7d57d4215b
Merge commit 'cdf58f0599c39852ee3beafe5f64af7d57d4215b'

* commit 'cdf58f0599c39852ee3beafe5f64af7d57d4215b':
  avpacket: fix copying side data in av_packet_copy_props()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/avpacket.c