[FFmpeg-cvslog] Merge commit '2651352988212531038326c44754ece1728c4a3b'

[Mark Thompson]

ffmpeg | branch: master | Mark Thompson <sw at jkqxz.net> | Wed Feb 21 21:23:50 2018 +0000| [d28eb0e34d80f12b779c7b6befc5b350ffcdf476] | committer: Mark Thompson

Merge commit '2651352988212531038326c44754ece1728c4a3b'

* commit '2651352988212531038326c44754ece1728c4a3b':
  cbs: Allocate the context inside the init function

This commit is a noop, see 6734eef6b8b464139fdc140ec9bc9e8d74173869

Merged-by: Mark Thompson <sw at jkqxz.net>

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