[FFmpeg-cvslog] Merge commit '60728e8bab8d2a5f6bbb4baa7d53142dbc6047ed'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 24 21:05:41 2014 +0100| [fc2de9b7cf59eda377fffcd8d6c3ab4b1fa57b22] | committer: Michael Niedermayer

Merge commit '60728e8bab8d2a5f6bbb4baa7d53142dbc6047ed'

* commit '60728e8bab8d2a5f6bbb4baa7d53142dbc6047ed':
  libx265: Write global extradata when requested

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

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