Merge commit '4ec1acc6e4f4d0bd28617bbb30ebfb779ce7df92' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Jul 2014 20:39:25 +0000 (22:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Jul 2014 20:39:25 +0000 (22:39 +0200)
commit5f1f1868b5ef2cf9055b37eb6aca730d9d6f7a3b
tree430640df76e9fd17b9abee488fa81fa459396f7f
parentebf381168af50021f1112a2564c9fe2c627e41d8
parent4ec1acc6e4f4d0bd28617bbb30ebfb779ce7df92
Merge commit '4ec1acc6e4f4d0bd28617bbb30ebfb779ce7df92' into release/2.2

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

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