[FFmpeg-cvslog] Merge commit '96c373c7704aeb1cc1d2c275fbb5d71777665589'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Thu Jan 28 16:54:26 2016 +0000| [5b0d4c247a3c3ba8a8ece70b31354121645c8320] | committer: Derek Buitenhuis

Merge commit '96c373c7704aeb1cc1d2c275fbb5d71777665589'

* commit '96c373c7704aeb1cc1d2c275fbb5d71777665589':
  lavc: Move context_model to codec private options

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

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