Merge commit '5b6f42da98c26a8aee8d2c2edfcbd0633ad1c607'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 3 Feb 2016 16:53:13 +0000 (16:53 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 3 Feb 2016 16:53:13 +0000 (16:53 +0000)
commit43c0298208ad6fe36a4dbf03824842d89c3ed143
tree27ea5b3341f1318ce79e26e590d36b2c26152fd2
parentf3af379b5c1816271b1afce0ccb2a935dc29940c
parent5b6f42da98c26a8aee8d2c2edfcbd0633ad1c607
Merge commit '5b6f42da98c26a8aee8d2c2edfcbd0633ad1c607'

* commit '5b6f42da98c26a8aee8d2c2edfcbd0633ad1c607':
  lavc: Move me_penalty_compensation to codec private options

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