[FFmpeg-cvslog] Merge commit '5764d38173661c29d954711dd5abfddf709e9ba4'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Thu Jan 28 15:21:21 2016 +0000| [7c6e86c0cec17dfc020d58c82f4f1af5fcaea6c1] | committer: Derek Buitenhuis

Merge commit '5764d38173661c29d954711dd5abfddf709e9ba4'

* commit '5764d38173661c29d954711dd5abfddf709e9ba4':
  lavc: Move chromaoffset to codec private options

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

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