[FFmpeg-cvslog] Merge commit 'efc7df6c1f11b20a48e60c3f743ce2331b661973'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May 15 19:31:32 2014 +0200| [9b7cb02319b65596b5ef106a830fd813248fb580] | committer: Michael Niedermayer

Merge commit 'efc7df6c1f11b20a48e60c3f743ce2331b661973'

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

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

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