Merge commit 'efc7df6c1f11b20a48e60c3f743ce2331b661973'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 15 May 2014 17:31:32 +0000 (19:31 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 15 May 2014 17:32:44 +0000 (19:32 +0200)
commit9b7cb02319b65596b5ef106a830fd813248fb580
tree24a33e256e7b272d75789a9b4642bd4128600c40
parentf478e8500a3d1fb0c6014956de42d87e292b9e3b
parentefc7df6c1f11b20a48e60c3f743ce2331b661973
Merge commit 'efc7df6c1f11b20a48e60c3f743ce2331b661973'

* commit 'efc7df6c1f11b20a48e60c3f743ce2331b661973':
  lavc: preserve the original private data in avcodec_copy_context()

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