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)
* commit 'cdf58f0599c39852ee3beafe5f64af7d57d4215b':
  avpacket: fix copying side data in av_packet_copy_props()

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

Simple merge