[FFmpeg-cvslog] Merge commit 'cdf58f0599c39852ee3beafe5f64af7d57d4215b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May 19 18:50:40 2014 +0200| [4a2fd251f477447cdd4f7ee14f3670a7f1f0c4ed] | committer: Michael Niedermayer

Merge commit 'cdf58f0599c39852ee3beafe5f64af7d57d4215b'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4a2fd251f477447cdd4f7ee14f3670a7f1f0c4ed
---