[FFmpeg-cvslog] Merge commit '12b49769223234673db1003d9c43e7483ceb0282'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Thu Jan 28 16:44:59 2016 +0000| [0e3e3656d31a7e1e595ccb5ca3acfc76a23d785e] | committer: Derek Buitenhuis

Merge commit '12b49769223234673db1003d9c43e7483ceb0282'

* commit '12b49769223234673db1003d9c43e7483ceb0282':
  lavc: Move mpeg_quant to codec private options

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

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