Merge commit '12b49769223234673db1003d9c43e7483ceb0282'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Thu, 28 Jan 2016 16:44:59 +0000 (16:44 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Thu, 28 Jan 2016 16:44:59 +0000 (16:44 +0000)
commit0e3e3656d31a7e1e595ccb5ca3acfc76a23d785e
tree144c6e7680198c13152d9cdd704c972f640a0216
parentb986a4625d0e67710f155a9816dbab186a98020e
parent12b49769223234673db1003d9c43e7483ceb0282
Merge commit '12b49769223234673db1003d9c43e7483ceb0282'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavcodec/avcodec.h
libavcodec/libxvid.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/options_table.h